diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-11-17 15:33:00 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2010-11-17 15:33:00 -0800 |
| commit | 68b1404804d239670092a40607eacbf03757ba16 (patch) | |
| tree | 85139cd42a40bf6b732d71937827b9d350adace1 /lib | |
| parent | a32bd16c6f3311c3f836346ac17ce80c777ac85f (diff) | |
| parent | b753d836c5ea18333a1199b20b5c495f562f2af4 (diff) | |
Merge branch 'ticket/next/5288' into next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/defaults.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index c4d8d5118..45152f29e 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -116,7 +116,7 @@ module Puppet :catalog_terminus => ["compiler", "Where to get node catalogs. This is useful to change if, for instance, you'd like to pre-compile catalogs and store them in memcached or some other easily-accessed store."], :facts_terminus => { - :default => Puppet.application_name.to_s == "master" ? 'yaml' : 'facter', + :default => Puppet.application_name.to_s == "master" ? 'yaml' : 'facter', :desc => "The node facts terminus.", :hook => proc do |value| require 'puppet/node/facts' @@ -599,7 +599,7 @@ module Puppet :inventory_port => ["$masterport", "The port to communicate with the inventory_server." ], - :report => [false, + :report => [true, "Whether to send reports after every transaction." ], :graph => [false, "Whether to create dot graph files for the different |
