Merge branch 'maint/fix_copyright_and_licensing'

* maint/fix_copyright_and_licensing: (maint) Fix licensing references to GNU GPL.
cies · Nov 13, 2011 · a6d9810 · a6d9810
2 parents 0fb94da + c5db2c2
commit a6d9810
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 39 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 Puppet Firewall Module - Puppet module for managing Firewalls
 
-Copyright (C) 2011 Puppet Labs Inc
+Copyright (C) 2011 Puppet Labs, Inc.
 Copyright (C) 2011 Jonathan Boyett
 
 Some of the iptables code was taken from puppet-iptables which was:

diff --git a/lib/puppet/util/firewall.rb b/lib/puppet/util/firewall.rb
@@ -1,25 +1,7 @@
-# Puppet Firewall Module
-#
-# Copyright (C) 2011 Bob.sh Limited
-# Copyright (C) 2008 Camptocamp Association
-# Copyright (C) 2007 Dmitri Priimak
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 require 'socket'
 require 'puppet/util/ipcidr'
 
+# Util module for puppetlabs-firewall
 module Puppet::Util::Firewall
   # Translate the symbolic names for icmp packet types to integers
   def icmp_name_to_number(value_icmp)

diff --git a/lib/puppet/util/ipcidr.rb b/lib/puppet/util/ipcidr.rb
@@ -1,24 +1,6 @@
-# Puppet Firewall Module
-#
-# Copyright (C) 2011 Bob.sh Limited
-# Copyright (C) 2008 Camptocamp Association
-# Copyright (C) 2007 Dmitri Priimak
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 require 'ipaddr'
 
+# IPCidr object wrapper for IPAddr
 module Puppet
   module Util
     class IPCidr < IPAddr