diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-02 14:43:15 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-02 14:43:15 -0800 |
| commit | dac675c94e6ed1ee67a3081ba7379e000ee93c1c (patch) | |
| tree | d01241c30e679ebf8c7a6be0d907ed3eda523584 /lib/puppet.rb | |
| parent | 022114d8e50b1adb785b38262251979a222e7972 (diff) | |
| parent | af6e08c0a59db951502d0cf8c0ca24f5001e92f1 (diff) | |
| download | puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.tar.gz puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.tar.xz puppet-dac675c94e6ed1ee67a3081ba7379e000ee93c1c.zip | |
Merge branch '2.6.x' into next
* 2.6.x:
(#5304) Use internal_name rather than real_name for maillist provider
Updated CHANGELOG and version for 2.6.4
Revert "(#5304) Use internal_name rather than real_name for maillist provider"
Disable remote ralsh by default
(#5424) Ship auth.conf as part of installing from source
(#5304) Use internal_name rather than real_name for maillist provider
Renamed Reductive to Puppet
Manually Resolved Conflicts:
lib/puppet/provider/maillist/mailman.rb
Diffstat (limited to 'lib/puppet.rb')
| -rw-r--r-- | lib/puppet.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb index 78fb5138b..a58d3c801 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -24,7 +24,7 @@ require 'puppet/util/run_mode' # 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 |