summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application/queue.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-13 23:00:35 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-13 23:00:35 -0700
commit9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 (patch)
tree19f55c6cb37bfd9bc39f0bf9060643ac61005415 /lib/puppet/application/queue.rb
parent1d93c4dd86181eb2663dd8df2e84719c2e1ffcdf (diff)
parentefa834aaec596b0d5e7b314a53e6b258ce44728c (diff)
downloadpuppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.gz
puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.xz
puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.zip
Merge commit '2.6.1rc4' into next
Diffstat (limited to 'lib/puppet/application/queue.rb')
-rw-r--r--lib/puppet/application/queue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/queue.rb b/lib/puppet/application/queue.rb
index 6c90ca0a1..239f6b2ad 100644
--- a/lib/puppet/application/queue.rb
+++ b/lib/puppet/application/queue.rb
@@ -38,7 +38,7 @@ class Puppet::Application::Queue < Puppet::Application
option("--verbose","-v")
def main
- require 'lib/puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
+ require 'puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
Puppet.notice "Starting puppetqd #{Puppet.version}"
Puppet::Resource::Catalog::Queue.subscribe do |catalog|
# Once you have a Puppet::Resource::Catalog instance, calling save on it should suffice