diff options
| author | Luke Kanies <luke@madstop.com> | 2008-10-22 18:30:57 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-10-22 18:30:57 -0500 |
| commit | 801b8a643d353176675023adaa25f26d0ec67403 (patch) | |
| tree | 10f93a48f33b426776797047c49db2948a0c2df9 /lib/puppet.rb | |
| parent | 9742c26310e6b30095651cb4e224c681603af1ff (diff) | |
| parent | b2c1149b5f374df77ad3e017749f22f6981a453f (diff) | |
| download | puppet-801b8a643d353176675023adaa25f26d0ec67403.tar.gz puppet-801b8a643d353176675023adaa25f26d0ec67403.tar.xz puppet-801b8a643d353176675023adaa25f26d0ec67403.zip | |
Merge branch '0.24.x'
Conflicts:
lib/puppet/type/user.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 cc3c8e304..ff714e441 100644 --- a/lib/puppet.rb +++ b/lib/puppet.rb @@ -25,7 +25,7 @@ require 'puppet/util/suidmanager' # it's also a place to find top-level commands like 'debug' module Puppet - PUPPETVERSION = '0.24.5' + PUPPETVERSION = '0.24.6' def Puppet.version return PUPPETVERSION |