diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-07 11:29:54 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-07 11:29:54 -0700 |
| commit | da4457be4dedaed5368bacf81a08f0429e21cd45 (patch) | |
| tree | 5c6149ed872d33f1f6711bac8a5b43f6dbd71a4a /lib/puppet/application | |
| parent | 1e4968e82a65b21ad5d075015830ef3f54efee05 (diff) | |
| parent | f7c6db9409e479ec1b54cfa85daa1ee51e5a7ad0 (diff) | |
| download | puppet-da4457be4dedaed5368bacf81a08f0429e21cd45.tar.gz puppet-da4457be4dedaed5368bacf81a08f0429e21cd45.tar.xz puppet-da4457be4dedaed5368bacf81a08f0429e21cd45.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
Fix #4339 - Locally save the last report to $lastrunreport
Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml
Fixed #3127 - removed legacy debug code
Fixed #3127 - Fixed gem selection regex
(#5437) Invalidate cached TypeCollection when there was an error parsing
(#6937) Adjust formatting of recurse's desc
(#6937) Document the recurse parameter of File type.
(#6893) Document the cron type in the case of specials.
(#5670) Don't trigger refresh from a failed resource
Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/agent.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/application/apply.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index 3749241f8..9f5921de1 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -229,6 +229,8 @@ class Puppet::Application::Agent < Puppet::Application Puppet::SSL::Host.ca_location = options[:fingerprint] ? :none : :remote Puppet::Transaction::Report.terminus_class = :rest + # we want the last report to be persisted locally + Puppet::Transaction::Report.cache_class = :yaml # Override the default; puppetd needs this, usually. # You can still override this on the command-line with, e.g., :compiler. diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb index cc733e1f5..7f0b95a89 100644 --- a/lib/puppet/application/apply.rb +++ b/lib/puppet/application/apply.rb @@ -148,6 +148,9 @@ class Puppet::Application::Apply < Puppet::Application exit(1) end + # we want the last report to be persisted locally + Puppet::Transaction::Report.cache_class = :yaml + if options[:debug] Puppet::Util::Log.level = :debug elsif options[:verbose] |