Updated CHANGELOG and version for 2.6.4

housejester · Dec 1, 2010 · 3f9f379 · 3f9f379
1 parent 76890a5
commit 3f9f379
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,14 @@
+2.6.4
+=====
+76890a5  Revert "(#5304) Use internal_name rather than real_name for maillist provider"
+19f3879  Disable remote ralsh by default
+eee1a9c  (#5424) Ship auth.conf as part of installing from source
+779fea8  (#5304) Use internal_name rather than real_name for maillist provider
+83f878e  Renamed Reductive to Puppet
+
 2.6.3
 =====
+53bb805  Incremented CHANGELOG for 2.6.3
 184733c  [#5322] (#5322) Remove spec file that adds little value and causes failures
 178c2a6  Fix test failures that fixing #4726 exposed.
 74b6c09  (#4726) Fix RRD legacy support

diff --git a/lib/puppet.rb b/lib/puppet.rb
@@ -24,7 +24,7 @@
 # it's also a place to find top-level commands like 'debug'
 
 module Puppet
-  PUPPETVERSION = '2.6.3'
+  PUPPETVERSION = '2.6.4'
 
   def Puppet.version
     PUPPETVERSION