diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-03 19:14:23 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-03 19:14:23 -0800 |
| commit | ec4254dec20c8cc8ab9ef3065f4325ed52b9eacd (patch) | |
| tree | 1d847e457af83163dadd933632ab3af1eeedbddd /lib/puppet.rb | |
| parent | 876d0503dd93329a73e7f335c10a47330d745293 (diff) | |
| parent | e10ba1ab720cb62b39b430104a55a987f4c37f31 (diff) | |
| download | puppet-ec4254dec20c8cc8ab9ef3065f4325ed52b9eacd.tar.gz puppet-ec4254dec20c8cc8ab9ef3065f4325ed52b9eacd.tar.xz puppet-ec4254dec20c8cc8ab9ef3065f4325ed52b9eacd.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
(#6018) Nick F's --help text for puppet inspect.
(#5823) document the not-an-API status of set_run_mode
(#5823) run mode can now be set dynamically...
(6114) Update the audit metaparameter for 2.6.5.
Fix for #5755 -- making zaml serialization robust over projected objects
(#4139) hook log autoflush into global defaults
Diffstat (limited to 'lib/puppet.rb')
0 files changed, 0 insertions, 0 deletions