Merge branch 'next'

* next: (204 commits)
  Revert "(#6928) Removed --ignoreimport"
  Updated CHANGELOG for 2.6.8rc1
  (#6928) Removed --ignoreimport
  (#6928) Remove --parseonly
  (#6928) Add a Parser face with Validate action
  (#6830) Fix sha1 to digest/sha1 require issue for Ruby 1.9
  (#6830) Fix UTF-8 encoding issue for Ruby 1.9
  (#6830) Fix string method sub call on a symbol for Ruby 1.9
  (#2331) Remove darwinports pkg provider, replace with rewritten macports provider
  (#7059) handle inherited action binding scope
  maint: ensure we handle '-foo=' options correctly in faces.
  (#2150) Fix File const lookup when configuring routes
  Fixed #7082 - Added system support for groups
  maint: install erb templates under lib/
  maint: clean up the spec test headers in bulk.
  (#7056) Use 'face' rather than 'faces' in the production code.
  maint: eliminate deprecated since 2008 code from Puppet.
  (#6117) Add POST support to indirector requests
  (#6962) Move option handling into #parse_options, not #preinit.
  maint: whitespace cleanup for puppet/util/command_line.
  ...

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'