summaryrefslogtreecommitdiffstats
path: root/ext
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 /ext
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 'ext')
-rwxr-xr-xext/nagios/naggen17
-rwxr-xr-xext/puppet-test16
-rwxr-xr-xext/yaml_nodes.rb16
3 files changed, 34 insertions, 15 deletions
diff --git a/ext/nagios/naggen b/ext/nagios/naggen
index c6ca15a55..16dbe6ce4 100755
--- a/ext/nagios/naggen
+++ b/ext/nagios/naggen
@@ -57,14 +57,21 @@
#
# naggen --storeconfigs --confdir /foo --compare
#
-# = Author
#
-# Luke Kanies
+# = License
+# Copyright 2011 Luke Kanies
#
-# = Copyright
+# 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
#
-# Copyright (c) 2009 Puppet Labs, LLC
-# Licensed under the GPL 2
+# 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.
require 'puppet'
require 'puppet/rails'
diff --git a/ext/puppet-test b/ext/puppet-test
index f2648c9ee..affb01249 100755
--- a/ext/puppet-test
+++ b/ext/puppet-test
@@ -84,14 +84,20 @@
#
# puppet-test --retrieve /module/path/to/file
#
-# = Author
+# = License
+# Copyright 2011 Luke Kanies
#
-# Luke Kanies
+# 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
#
-# = Copyright
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Copyright (c) 2005, 2006 Puppet Labs, LLC
-# Licensed under the GNU Public License
+# 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.
# Do an initial trap, so that cancels don't get a stack trace.
trap(:INT) do
diff --git a/ext/yaml_nodes.rb b/ext/yaml_nodes.rb
index 2174da09d..3c7077c13 100755
--- a/ext/yaml_nodes.rb
+++ b/ext/yaml_nodes.rb
@@ -23,14 +23,20 @@
# yamldir::
# Specify where the yaml is found. Defaults to 'yaml' in the current directory.
#
-# = Author
+# = License
+# Copyright 2011 Luke Kanies
#
-# Luke Kanies
+# 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
#
-# = Copyright
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Copyright (c) 2009 Puppet Labs, Inc.
-# Licensed under the GPL2
+# 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.
require 'yaml'
require 'optparse'