summaryrefslogtreecommitdiffstats
path: root/lib/puppet.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-12-22 21:44:37 -0600
committerLuke Kanies <luke@madstop.com>2007-12-22 21:44:37 -0600
commit1deb7fd487dca1046beb933dca2cccadf44fa6f5 (patch)
tree06343d67499adecb28c4465fd15c92ad9336e109 /lib/puppet.rb
parentf3fd7091d3db9dff1b177867589289890e9a3a66 (diff)
parentc4ed43c2a1ad9ab865e3da6b8b7fad28222c3451 (diff)
downloadpuppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.gz
puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.xz
puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.zip
Merge branch '0.24.x'
Conflicts: conf/redhat/puppet.spec
Diffstat (limited to 'lib/puppet.rb')
-rw-r--r--lib/puppet.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index 3fc1cee2f..18037cdc1 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.0'
+ PUPPETVERSION = '0.24.1'
def Puppet.version
return PUPPETVERSION