diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-29 14:33:49 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-29 14:33:49 -0800 |
| commit | cb6e9c990945501962bf9bf864309e8e6f83b827 (patch) | |
| tree | 7109f1605e4dceca9e48ef58b41bda559ba4901d /lib/puppet/application/queue.rb | |
| parent | 52f9ef06507d87026936dc90dcb467a728ebd54f (diff) | |
| parent | 71ecad9904c8c48c023e90e5fbea5b26b180c9cf (diff) | |
Merge branch 'maint/next/remove_indirection_delegation' into next
* maint/next/remove_indirection_delegation:
Maint: Refactor code to use <class>.indirection.<method>
Maint: Refactor tests to use <class>.indirection.<method>
Diffstat (limited to 'lib/puppet/application/queue.rb')
| -rw-r--r-- | lib/puppet/application/queue.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/queue.rb b/lib/puppet/application/queue.rb index 239f6b2ad..c7e0ce8cc 100644 --- a/lib/puppet/application/queue.rb +++ b/lib/puppet/application/queue.rb @@ -79,7 +79,7 @@ class Puppet::Application::Queue < Puppet::Application exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs? require 'puppet/resource/catalog' - Puppet::Resource::Catalog.terminus_class = :active_record + Puppet::Resource::Catalog.indirection.terminus_class = :active_record daemon.daemonize if Puppet[:daemonize] @@ -87,6 +87,6 @@ class Puppet::Application::Queue < Puppet::Application # class set up, because if storeconfigs is enabled, # we'll get a loop of continually caching the catalog # for storage again. - Puppet::Resource::Catalog.cache_class = nil + Puppet::Resource::Catalog.indirection.cache_class = nil end end |