Skip to content

Commit 33e4757

Browse files
authored
Merge pull request #31 from casangi/add_cla_eso_on_updated_cla_license
Add CLA_ESO on updated CLA and License
2 parents 48940c7 + a36b4b1 commit 33e4757

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

CONTRIBUTOR_LICENSING_AGREEMENT.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ Work to which you have contributed, constitutes direct or contributory patent in
3131
any patent licenses granted to that entity under this Agreement for that Contribution or Work
3232
shall terminate as of the date such litigation is filed.
3333

34-
4. You represent that you are legally entitled to grant the above license. If your employer(s) has
35-
rights to intellectual property that you create that includes your Contributions, you represent
36-
that you have received permission to make Contributions on behalf of that employer, that your
37-
employer has waived such rights for your Contributions to the Project, or that your employer
38-
has executed a separate agreement.
34+
4. You represent that you are legally entitled to grant the above license. If a third party has rights to
35+
intellectual property that you create that includes your Contributions, you represent that you have received
36+
permission to make Contributions on behalf of that party, that they have waived such rights for your Contributions
37+
to the Project, or that they have executed a separate agreement.
3938

4039
5. You represent that each of Your Contributions is Your original creation. You represent that Your
4140
Contribution submissions include complete details of any third-party license or other restriction
@@ -49,7 +48,8 @@ such third party materials.
4948
to provide support. You may provide support for free, for a fee, or not at all. Unless required by
5049
applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS,
5150
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
52-
including, without limitation, any warranties or conditions of TITLE, NON-NFRINGEMENT,
51+
including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
52+
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
5353

5454
7. You agree to notify the Project of any facts or circumstances of which you become aware that
5555
would make these representations inaccurate in any respect.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Contributions made on behalf of ESO (European Southern Observatory) acknowledge the Contributor
2+
License Agreement found in the file CONTRIBUTOR_LICENSING_AGREEMENT.txt in the root of this
3+
code repository, version from commit f4a393f659fad9a3164d69139a221443b89c2629
4+
(https://github.com/casangi/astroviper/blob/f4a393f659fad9a3164d69139a221443b89c2629/CONTRIBUTOR_LICENSING_AGREEMENT.txt),
5+
from April 29, 2025.
6+
7+
Contributors have been granted permission to accept the Contributor License Agreement by the Head
8+
of the ESO ALMA Support Centre (EASC) in accordance with the AGREEMENT ON THE USE AND LICENSING
9+
OF THE ALMA DATA PROCESSING SOFTWARE, signed by AUI, ESO and NAOJ in Feb 2025.

LICENSE.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2023, Associated Universities, Inc.
3+
All works in this repository are copyrighted 2024.
4+
For inquiries contact Associated Universities, Inc., 2650 Park Tower Drive Vienna, VA 22180, USA.
5+
6+
Portions of this repository are copyrighted by the following entities:
7+
1. AUI/NRAO, ESO, NAOJ, in the framework of the ALMA partnership.
8+
2. AUI/NRAO in the framework of the ngVLA project.
49

510
Redistribution and use in source and binary forms, with or without
611
modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)