Merge branch '2.7.x'

Conflicts:
	lib/puppet/feature/base.rb
	lib/puppet/file_serving/configuration.rb
	spec/unit/indirector/ssl_file_spec.rb
	spec/unit/parser/functions/extlookup_spec.rb
	spec/unit/resource/catalog_spec.rb
	test/language/ast/variable.rb

7 files changed, 0 insertions, 28 deletions

diff --git a/test/lib/puppettest/support/resources.rb b/test/lib/puppettest/support/resources.rb
index 2b922bb1e..d5bf98f91 100755
--- a/test/lib/puppettest/support/resources.rb
+++ b/test/lib/puppettest/support/resources.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke A. Kanies on 2006-11-29.
-#  Copyright (c) 2006. All rights reserved.
-
 module PuppetTest::Support::Resources
   def tree_resource(name)
     Puppet::Type.type(:file).new :title => name, :path => "/tmp/#{name}", :mode => 0755
diff --git a/test/lib/puppettest/testcase.rb b/test/lib/puppettest/testcase.rb
index b1b22e524..0ec98846c 100644..100755
--- a/test/lib/puppettest/testcase.rb
+++ b/test/lib/puppettest/testcase.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke A. Kanies on 2007-03-05.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'puppettest'
 require 'puppettest/runnable_test'
 require 'test/unit'
diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb
index 030f38c50..8b0b8df95 100755
--- a/test/ral/manager/attributes.rb
+++ b/test/ral/manager/attributes.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke A. Kanies on 2007-02-05.
-#  Copyright (c) 2007. All rights reserved.
-
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
diff --git a/test/ral/manager/instances.rb b/test/ral/manager/instances.rb
index f1731ac64..f59f43da1 100755
--- a/test/ral/manager/instances.rb
+++ b/test/ral/manager/instances.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke A. Kanies on 2007-06-10.
-#  Copyright (c) 2007. All rights reserved.
-
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb
index 9c9449a45..e42c6c293 100755
--- a/test/ral/manager/manager.rb
+++ b/test/ral/manager/manager.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke A. Kanies on 2006-11-29.
-#  Copyright (c) 2006. All rights reserved.
-
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb
index 112246b12..1b5a63e7d 100755
--- a/test/ral/providers/service/base.rb
+++ b/test/ral/providers/service/base.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke A. Kanies on 2007-01-28.
-#  Copyright (c) 2007. All rights reserved.
-
 require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
diff --git a/test/ral/type/resources.rb b/test/ral/type/resources.rb
index fcfeebe10..21604ba8e 100755
--- a/test/ral/type/resources.rb
+++ b/test/ral/type/resources.rb
@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-#
-#  Created by Luke Kanies on 2006-12-12.
-#  Copyright (c) 2006. All rights reserved.
-
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'