Merge branch 'ticket/2.6.next/maint-remove_version_control_tags' into 2.6.next

* ticket/2.6.next/maint-remove_version_control_tags:
  (#6338) Remove unused version control tags

11 files changed, 0 insertions, 23 deletions

diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd
index b6cf05736..8acc19cfa 100755
--- a/conf/solaris/smf/svc-puppetd
+++ b/conf/solaris/smf/svc-puppetd
@@ -62,5 +62,3 @@ status)
     fi
 esac
 exit 0
-
-# $Id$
diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd
index 80e3d464a..683324dec 100755
--- a/conf/solaris/smf/svc-puppetmasterd
+++ b/conf/solaris/smf/svc-puppetmasterd
@@ -58,5 +58,3 @@ status)
     fi
 esac
 exit 0
-
-# $Id$
diff --git a/examples/etc/init.d/sleeper b/examples/etc/init.d/sleeper
index 63f7e9c2e..c60a5555c 100755
--- a/examples/etc/init.d/sleeper
+++ b/examples/etc/init.d/sleeper
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-# $Id$
-
 script=$0
 path=`echo $script | sed 's/etc..*/bin/'`
 
diff --git a/lib/puppet/external/nagios.rb b/lib/puppet/external/nagios.rb
index 6b8852ee5..2ed829198 100755
--- a/lib/puppet/external/nagios.rb
+++ b/lib/puppet/external/nagios.rb
@@ -3,8 +3,6 @@
 #--------------------
 # A script to retrieve hosts from ldap and create an importable
 # cfservd file from them
-#
-# $Id: nagios.rb,v 1.3 2004/06/09 20:32:46 luke Exp $
 
 require 'digest/md5'
 #require 'ldap'
diff --git a/lib/puppet/external/nagios/base.rb b/lib/puppet/external/nagios/base.rb
index ac1d25e2e..e98760e01 100755
--- a/lib/puppet/external/nagios/base.rb
+++ b/lib/puppet/external/nagios/base.rb
@@ -470,5 +470,3 @@ class Nagios::Base
   end
 
 end
-
-# $Id$
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 6360f5064..5e25b9d6c 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -874,6 +874,3 @@ require 'puppet/parser/parser_support'
 # Local Variables:
 # mode: ruby
 # End:
-
-# $Id$
-
diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
index 382c74267..20f5d77e6 100644
--- a/lib/puppet/provider/service/gentoo.rb
+++ b/lib/puppet/provider/service/gentoo.rb
@@ -48,5 +48,3 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
       raise Puppet::Error, "Could not enable #{self.name}: #{output}"
   end
 end
-
-# $Id $
diff --git a/lib/puppet/rails/fact_name.rb b/lib/puppet/rails/fact_name.rb
index fb40ec48f..4273399e5 100644
--- a/lib/puppet/rails/fact_name.rb
+++ b/lib/puppet/rails/fact_name.rb
@@ -3,5 +3,3 @@ require 'puppet/rails/fact_value'
 class Puppet::Rails::FactName < ActiveRecord::Base
   has_many :fact_values, :dependent => :destroy
 end
-
-# $Id: fact_name.rb 1952 2006-12-19 05:47:57Z luke $
diff --git a/lib/puppet/rails/fact_value.rb b/lib/puppet/rails/fact_value.rb
index 45a88b2dc..9fd81ae1c 100644
--- a/lib/puppet/rails/fact_value.rb
+++ b/lib/puppet/rails/fact_value.rb
@@ -6,5 +6,3 @@ class Puppet::Rails::FactValue < ActiveRecord::Base
     "#{self.fact_name.name}"
   end
 end
-
-# $Id: fact_value.rb 1952 2006-12-19 05:47:57Z luke $
diff --git a/lib/puppet/type/k5login.rb b/lib/puppet/type/k5login.rb
index a343e9e5c..eac142ff7 100644
--- a/lib/puppet/type/k5login.rb
+++ b/lib/puppet/type/k5login.rb
@@ -1,5 +1,3 @@
-# $Id: k5login.rb 2468 2007-08-07 23:30:20Z digant $
-#
 # Plug-in type for handling k5login files
 
 Puppet::Type.newtype(:k5login) do
diff --git a/test/Rakefile b/test/Rakefile
index 47be213d9..7cde050f6 100644
--- a/test/Rakefile
+++ b/test/Rakefile
@@ -94,5 +94,3 @@ filemap.each do |dir, files|
     # And alias it with a slash on the end
     task(dir + "/" => dir)
 end
-
-# $Id$