summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util
diff options
context:
space:
mode:
authorMichael V. O'Brien <michael@reductivelabs.com>2007-10-03 17:06:06 -0500
committerMichael V. O'Brien <michael@reductivelabs.com>2007-10-03 17:06:06 -0500
commit0b8893b3b8ffd391287a590b4f271edca70331da (patch)
treed95e932676c7d06310d20e0248e5bc4be89fa91b /lib/puppet/util
parented8fa9b3458cacd67d9bd023a2a319c351e76e95 (diff)
downloadpuppet-0b8893b3b8ffd391287a590b4f271edca70331da.tar.gz
puppet-0b8893b3b8ffd391287a590b4f271edca70331da.tar.xz
puppet-0b8893b3b8ffd391287a590b4f271edca70331da.zip
Fixed #832. Added the '--no-daemonize' option to puppetd and puppetmasterd.
The default behavior of 'verbose' and 'debug' no longer cause puppetd and puppetmasterd to not daemonize.
Diffstat (limited to 'lib/puppet/util')
-rw-r--r--lib/puppet/util/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 1478cd8a5..ab55fbd2b 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -562,7 +562,7 @@ class Puppet::Util::Settings
return transport.to_configuration
end
- # Convert our list of objects into a configuration file.
+ # Convert our list of config elements into a configuration file.
def to_config
str = %{The configuration file for #{Puppet[:name]}. Note that this file
is likely to have unused configuration parameters in it; any parameter that's