diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-07-04 09:04:20 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-07-04 09:04:20 +1000 |
| commit | f462617295c6b2ae4e6d2ba3b8e73f7fc5189983 (patch) | |
| tree | 21ef3073c9c17511802a7ed5797728f902763d89 | |
| parent | 32d09e1915f7a17fb15fd22d47c5beb30d303272 (diff) | |
| parent | bd3f8e37a275710873b4a7566212d8b3388fb09f (diff) | |
| download | puppet-f462617295c6b2ae4e6d2ba3b8e73f7fc5189983.tar.gz puppet-f462617295c6b2ae4e6d2ba3b8e73f7fc5189983.tar.xz puppet-f462617295c6b2ae4e6d2ba3b8e73f7fc5189983.zip | |
Merge branch 'tickets/0.24.x/1240' of git://github.com/lak/puppet into 0.24.x
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rwxr-xr-x | bin/puppet | 2 |
2 files changed, 5 insertions, 0 deletions
@@ -2,6 +2,9 @@ Fixed #1232 - the rundir no longer specifies a user/group, and there are now client- and server-specific yaml directories. + Fixed 1240 - puppet will function more like puppetd if graphing + or reporting are enabled. + Fixed #1006 - puppetrun --class works again. I added the class membership testing to the Ldap node terminus, and added tests, so it shouldn't break again. diff --git a/bin/puppet b/bin/puppet index 5e10ad460..530766800 100755 --- a/bin/puppet +++ b/bin/puppet @@ -212,6 +212,8 @@ begin # Translate it to a RAL catalog catalog = catalog.to_ral + catalog.host_config = true if Puppet[:graph] or Puppet[:report] + catalog.finalize # And apply it |