summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2010-12-28 04:43:16 +1100
committerJames Turnbull <james@lovedthanlost.net>2011-04-11 07:55:12 +1000
commitd2145d9a02ce1802ceb44f0cf99090af62cc4b71 (patch)
tree2a1fca7225bf7ef884296dbf00a0a1ad6959f6e9 /LICENSE
parent50756588baad21d9b399051153274a89857433ef (diff)
downloadpuppet-d2145d9a02ce1802ceb44f0cf99090af62cc4b71.tar.gz
puppet-d2145d9a02ce1802ceb44f0cf99090af62cc4b71.tar.xz
puppet-d2145d9a02ce1802ceb44f0cf99090af62cc4b71.zip
Fixed #5684 - Move to Apache 2.0 license
For details of why we're moving please see: https://groups.google.com/d/topic/puppet-users/NuspYhMpE5o/discussion Removed explicit GPL licenses where appropriate Replaced selected GPL licenses with Apache 2.0 Replaced LICENSE with Apache 2.0 Updated README
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE26
1 files changed, 13 insertions, 13 deletions
diff --git a/LICENSE b/LICENSE
index 6bfcc22a1..e95cc9fc1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,17 +1,17 @@
-Puppet - Automating Configuration Management. Copyright (C) 2005 Puppet Labs LLC
+ Puppet - Automating Configuration Management.
-Puppet Labs can be contacted at: info@puppetlabs.com
+ Copyright (C) 2011 Puppet Labs Inc
-This program and entire repository is free software; you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License Version 2 as published by the Free Software
-Foundation.
+ Puppet Labs can be contacted at: info@puppetlabs.com
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ 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
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ 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.