diff options
author | Nick Lewis <nick@puppetlabs.com> | 2010-12-16 11:34:09 -0800 |
---|---|---|
committer | Nick Lewis <nick@puppetlabs.com> | 2010-12-16 11:34:09 -0800 |
commit | a2ff092d8302e09aa79f9bb16636f8298316c3c7 (patch) | |
tree | cb67d36e37e252edceef1cd848cc32d679f5d20e /lib/puppet.rb | |
parent | 4b35402ba85d8842d757becec5c8a7bf4d6f6654 (diff) | |
parent | 480c399f183627f5f588e9dc9f5f86f683c0e468 (diff) | |
download | puppet-a2ff092d8302e09aa79f9bb16636f8298316c3c7.tar.gz puppet-a2ff092d8302e09aa79f9bb16636f8298316c3c7.tar.xz puppet-a2ff092d8302e09aa79f9bb16636f8298316c3c7.zip |
Merge branch 'next'
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 |