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

Contributor agreement and copyright update. #2730

Merged
merged 7 commits into from
Jul 18, 2018

Conversation

hjoliver
Copy link
Member

One for you @dpmatthews!

@hjoliver hjoliver added this to the next maintenance release milestone Jul 17, 2018
@hjoliver hjoliver self-assigned this Jul 17, 2018
@hjoliver hjoliver requested a review from dpmatthews July 17, 2018 11:20
@hjoliver
Copy link
Member Author

Note the italicised sentence in CONTRIBUTING.md - I think that should be a sufficient measure for "backward compatibility", no?

@hjoliver hjoliver requested a review from matthewrmshin July 17, 2018 22:57
@hjoliver hjoliver force-pushed the contributors branch 5 times, most recently from ef11f34 to 40ec386 Compare July 17, 2018 23:16
@hjoliver
Copy link
Member Author

(Discussing the exact wording offline.)

@matthewrmshin
Copy link
Contributor

Failing the code style test!

@hjoliver
Copy link
Member Author

Doh. Fixed.

Copy link
Contributor

@dpmatthews dpmatthews left a comment

Choose a reason for hiding this comment

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

Just a minor comment (missed in my offline feedback)

CONTRIBUTING.md Outdated
The following people have contributed to this code under the terms of
the Contributor Licence Agreement and Certificate of Origin detailed
below (_except for the parenthesised names, which represent contributions
from outside of NIWA and Met Office that predate the explicit introduction of
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be "the Met Office"

@hjoliver
Copy link
Member Author

(Done - also in in-source Copyright file-headers)

@dpmatthews
Copy link
Contributor

Better to leave it out of the copyright notices - e.g. we don't have it Rose.
Sorry.

@hjoliver
Copy link
Member Author

You're hard to please today! Try it for size now.

Copy link
Contributor

@dpmatthews dpmatthews left a comment

Choose a reason for hiding this comment

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

Thanks!

@matthewrmshin matthewrmshin merged commit 32629c7 into cylc:master Jul 18, 2018
@hjoliver hjoliver deleted the contributors branch July 18, 2018 14:01
@matthewrmshin
Copy link
Contributor

Not sure I want to cherry pick this one. Does it need to go to 7.7.2?

@hjoliver
Copy link
Member Author

Good point. Change it to 7.8.0. It's on master now, so new contributors will still need to agree to it anyway.

@hjoliver
Copy link
Member Author

(changed milestone)

sadielbartholomew added a commit to sadielbartholomew/cylc-flow that referenced this pull request Jul 19, 2018
sadielbartholomew added a commit to sadielbartholomew/cylc-flow that referenced this pull request Jul 19, 2018
sadielbartholomew added a commit to sadielbartholomew/cylc-flow that referenced this pull request Jul 19, 2018
sadielbartholomew added a commit to sadielbartholomew/cylc-flow that referenced this pull request Sep 14, 2018
kinow pushed a commit to kinow/cylc-flow that referenced this pull request Oct 18, 2018
kinow pushed a commit to kinow/cylc-flow that referenced this pull request Oct 18, 2018
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.

3 participants