Skip to content

Conversation

@DavidS
Copy link

@DavidS DavidS commented Feb 16, 2016

No description provided.

@daenney
Copy link

daenney commented Feb 16, 2016

Oi oi oi. You can't just override the license like that. Or at least you can't just remove the copyright 😱.

@DavidS
Copy link
Author

DavidS commented Feb 16, 2016

The original "License" statement moved to NOTICE, in accordance to the ASF's guidelines for applying Apache-2.0. This doesn't change the legal status of anything as far as I can tell.

I should probably add some words to that effect in the commit message.

@daenney
Copy link

daenney commented Feb 16, 2016

Oh, you're absolutely right. I missed that.

This moves all copyright statements to the NOTICE file in accordance with the ASFs guidelines on applying the Apache-2.0 license.
@DavidS DavidS force-pushed the fm-4046-update-msync branch from 8375b70 to 5415856 Compare February 16, 2016 16:33
@DavidS
Copy link
Author

DavidS commented Feb 16, 2016

This commit message better?

@daenney
Copy link

daenney commented Feb 16, 2016

Yes, thank you! ❤️

tphoney added a commit that referenced this pull request Feb 16, 2016
(FM-4046) Update to current msync configs [006831f]
@tphoney tphoney merged commit 2ddc359 into puppetlabs:master Feb 16, 2016
@DavidS DavidS deleted the fm-4046-update-msync branch February 16, 2016 17:04
@alexjfisher
Copy link

@DavidS But what happened to the MIT license bit??

I'm trying to figure out what should be in the metadata.json in puppet-unattended_upgrades. See
voxpupuli/puppet-unattended_upgrades#93

in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

Choose a reason for hiding this comment

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

This is the MIT license though, isn't it?

Copy link
Author

Choose a reason for hiding this comment

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

Apache-2.0, which the latter contributions through Puppet Labs, Inc., were licensed is more restrictive than the original MIT, it makes sense to have it in the main file. Attributions are still preserved in the NOTICE file, which is recommended by the Apache 2.0 application guidelines.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants