summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-18 23:25:04 -0600
committerLuke Kanies <luke@madstop.com>2007-11-18 23:25:04 -0600
commit8838e9bb7cf5d0445a8ddbce0bd983551a191659 (patch)
tree91a66e9d8a6b36e8ba20e485e36dd7dd770fd6f5 /lib/puppet/network
parentedc4b1deefee5e0e0088c0f291137bbfa9cb2434 (diff)
parent61ef2893c57584ad3166241c6e412c1b4d014a4b (diff)
downloadpuppet-8838e9bb7cf5d0445a8ddbce0bd983551a191659.tar.gz
puppet-8838e9bb7cf5d0445a8ddbce0bd983551a191659.tar.xz
puppet-8838e9bb7cf5d0445a8ddbce0bd983551a191659.zip
Merge commit 'davids-bugfixes/rest/fix-815-by-using-main-explicitly'
Diffstat (limited to 'lib/puppet/network')
-rwxr-xr-xlib/puppet/network/handler/report.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb
index 12abc9b15..8ddeed9f6 100755
--- a/lib/puppet/network/handler/report.rb
+++ b/lib/puppet/network/handler/report.rb
@@ -18,7 +18,7 @@ class Puppet::Network::Handler
def initialize(*args)
super
- Puppet.settings.use(:reporting, :metrics)
+ Puppet.settings.use(:main, :reporting, :metrics)
end
# Accept a report from a client.