diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-10-28 13:40:26 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-10-28 13:40:26 +1100 |
| commit | 05a5e14e2c1387ee15d37c325b6795f121ceb28c (patch) | |
| tree | 3aec825499186950a0d80bc6e8e106258da05c87 | |
| parent | 9ecbd6306d227189ba161954aafc3e7f782a87b9 (diff) | |
| parent | b2c1149b5f374df77ad3e017749f22f6981a453f (diff) | |
| download | puppet-05a5e14e2c1387ee15d37c325b6795f121ceb28c.tar.gz puppet-05a5e14e2c1387ee15d37c325b6795f121ceb28c.tar.xz puppet-05a5e14e2c1387ee15d37c325b6795f121ceb28c.zip | |
Merge branch 'l' into 0.24.x
Conflicts:
conf/redhat/puppet.spec
| -rw-r--r-- | conf/redhat/puppet.spec | 3 | ||||
| -rw-r--r-- | lib/puppet.rb | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/conf/redhat/puppet.spec b/conf/redhat/puppet.spec index e09882303..367836abe 100644 --- a/conf/redhat/puppet.spec +++ b/conf/redhat/puppet.spec @@ -5,9 +5,6 @@ Name: puppet Version: 0.24.6 Release: 1%{?dist} Summary: A network tool for managing many disparate systems - -Group: System Environment/Base - License: GPLv2+ URL: http://puppet.reductivelabs.com/ Source0: http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz diff --git a/lib/puppet.rb b/lib/puppet.rb index 21e27147f..acf324642 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 |