From 14bf0043815a5dfd9cc514d51042e5d16b25697d Mon Sep 17 00:00:00 2001 From: Daniele Sluijters Date: Fri, 21 Feb 2014 18:39:39 +0100 Subject: [PATCH] README/LICENSE: Fix licensing. Closes #152 (cherry picked from commit 08c1283437e2a7072e788f489f1de73dbc9a6c5d) --- LICENSE | 15 +++++++++++++++ README.md | 7 +++++++ 2 files changed, 22 insertions(+) diff --git a/LICENSE b/LICENSE index 638c347..30ce036 100644 --- a/LICENSE +++ b/LICENSE @@ -17,3 +17,18 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright 2014 Puppet Labs + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/README.md b/README.md index e4bd14a..73e2aa2 100644 --- a/README.md +++ b/README.md @@ -204,6 +204,13 @@ We want to keep it as easy as possible to contribute changes so that our modules You can read the complete module contribution guide [on the Puppet Labs wiki.](http://projects.puppetlabs.com/projects/module-site/wiki/Module_contributing) +License +------- + +The original code for this module comes from Evolving Web and was licensed under the MIT license. Code added since the fork of this module is licensed under the Apache 2.0 License like the rest of the Puppet Labs products. + +The LICENSE contains both licenses. + Contributors ------------ -- 2.45.2