Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent license across all the project #550

Merged
merged 6 commits into from
Jun 8, 2018
Merged

Consistent license across all the project #550

merged 6 commits into from
Jun 8, 2018

Conversation

abdonrd
Copy link
Member

@abdonrd abdonrd commented Jun 8, 2018

Summary

Consistent license across all the project.

Details and comments

PR requested by @jaygambetta.
Don't merge yet: there are still some changes that he will make.

@jaygambetta
Copy link
Member

i could not see changes to the contribution file. We need to have something in there that we are using a CLA

@jaygambetta
Copy link
Member

jaygambetta commented Jun 8, 2018

Contributor License Agreements

We'd love to accept your code! Before we can, we have to get a few legal requirements sorted out.

Before we can accept a pull request from you, you'll need to sign a Contributor License Agreement (CLA). It is an automated process and you only need to do it once. (i feel like we need to describe the cla assist a bit here)

NOTE: If you work for a company that wants to allow you to contribute your work, then you'll need to sign a corporate CLA (link to download file) and email it to us at [email protected].

@abdonrd
Copy link
Member Author

abdonrd commented Jun 8, 2018

Delegate the CLA to #552.

@abdonrd abdonrd changed the title [WIP] Consistent license across all the project Consistent license across all the project Jun 8, 2018
jaygambetta
jaygambetta previously approved these changes Jun 8, 2018
.travis.yml Outdated
@@ -1,17 +1,7 @@
# Copyright 2017 IBM RESEARCH. All Rights Reserved.
# Copyright (c) 2017, IBM.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we drop the (c) and only have the comma if it goes over more than one year

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's already done! 🎉

@diego-plan9
Copy link
Member

Wonderful, thanks @abdonrd and @jaygambetta !

@diego-plan9 diego-plan9 merged commit 6bbc764 into Qiskit:master Jun 8, 2018
@abdonrd abdonrd deleted the update-license branch June 8, 2018 13:27
lia-approves pushed a commit to edasgupta/qiskit-terra that referenced this pull request Jul 30, 2019
* Consistent license across all the project

* Update license

* Update LICENSE.txt

* Update licenses

* Fix linter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants