Merge branch 'routing' of http://git.rickbradley.com/puppet into routing

9 files changed, 0 insertions, 9 deletions

diff --git a/test/other/dsl.rb b/test/other/dsl.rb
index 59610cd0f..0d891bf1a 100755
--- a/test/other/dsl.rb
+++ b/test/other/dsl.rb
@@ -4,7 +4,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/dsl'
-require 'puppet/util/autoload'
 require 'puppettest'
 
 class TestDSL < Test::Unit::TestCase
diff --git a/test/other/events.rb b/test/other/events.rb
index b67ea05a1..30b045695 100755
--- a/test/other/events.rb
+++ b/test/other/events.rb
@@ -5,7 +5,6 @@ $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppet'
 require 'puppettest'
 
-# $Id$
 
 class TestEvents < Test::Unit::TestCase
 	include PuppetTest
diff --git a/test/other/overrides.rb b/test/other/overrides.rb
index 9a7c4b8ba..bfdf174a4 100755
--- a/test/other/overrides.rb
+++ b/test/other/overrides.rb
@@ -105,4 +105,3 @@ class TestOverrides < Test::Unit::TestCase
     end
 end
 
-# $Id$
diff --git a/test/other/propertychange.rb b/test/other/propertychange.rb
index 6d5c91b34..34669771b 100755
--- a/test/other/propertychange.rb
+++ b/test/other/propertychange.rb
@@ -138,4 +138,3 @@ class TestPropertyChange < Test::Unit::TestCase
     end
 end
 
-# $Id$
diff --git a/test/other/provider.rb b/test/other/provider.rb
index 9a9b00a70..a39c4e1e9 100755
--- a/test/other/provider.rb
+++ b/test/other/provider.rb
@@ -159,4 +159,3 @@ class TestImpl < Test::Unit::TestCase
     end
 end
 
-# $Id$
diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index b9bf16475..45039e3c6 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -129,4 +129,3 @@ class TestPuppetModule < Test::Unit::TestCase
     end
 end
 
-# $Id$
diff --git a/test/other/relationship.rb b/test/other/relationship.rb
index 0a4d725ae..60c240b7a 100755
--- a/test/other/relationship.rb
+++ b/test/other/relationship.rb
@@ -71,4 +71,3 @@ class TestRelationship < Test::Unit::TestCase
     end
 end
 
-# $Id$
diff --git a/test/other/relationships.rb b/test/other/relationships.rb
index 771b119ee..edf97373c 100755
--- a/test/other/relationships.rb
+++ b/test/other/relationships.rb
@@ -213,4 +213,3 @@ class TestRelationships < Test::Unit::TestCase
     end
 end
 
-# $Id$
diff --git a/test/other/report.rb b/test/other/report.rb
index 3de2dfbee..8f33a7166 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -243,4 +243,3 @@ class TestReports < Test::Unit::TestCase
     end
 end
 
-# $Id$