diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-30 13:01:46 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-30 13:01:46 -0700 |
| commit | 11309a214148abb2167c1bd0adba0e035b2d8384 (patch) | |
| tree | bfd37ac5887307857d0b0d79a1db034010eed424 /lib/puppet/application/master.rb | |
| parent | 9290b2f990fd4b267b2eb0da719b8f320484c4d7 (diff) | |
| parent | 9d17809e5b240aa80d2c30f4d9625d4812802b8f (diff) | |
| download | puppet-11309a214148abb2167c1bd0adba0e035b2d8384.tar.gz puppet-11309a214148abb2167c1bd0adba0e035b2d8384.tar.xz puppet-11309a214148abb2167c1bd0adba0e035b2d8384.zip | |
Merge branch '2.6.x' into next
* 2.6.x:
(#5908) Add support for new update-rc.d disable API
(#6862) Add a default subject for the mail_patches rake task
Fixed #6256 - Creation of rrd directory.
Diffstat (limited to 'lib/puppet/application/master.rb')
| -rw-r--r-- | lib/puppet/application/master.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb index 3bfad89f4..78499a92a 100644 --- a/lib/puppet/application/master.rb +++ b/lib/puppet/application/master.rb @@ -222,7 +222,7 @@ License exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs? - Puppet.settings.use :main, :master, :ssl + Puppet.settings.use :main, :master, :ssl, :metrics # Cache our nodes in yaml. Currently not configurable. Puppet::Node.indirection.cache_class = :yaml |