diff options
| author | Luke Kanies <luke@madstop.com> | 2008-04-11 13:01:42 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-11 13:01:42 -0500 |
| commit | fb05ef3c96038d67a46eb142202af186ad6cb0b3 (patch) | |
| tree | 148e8b882e5c8104c4f3fa8ecc4288e8608f812d /lib/puppet/defaults.rb | |
| parent | b49fb68f768e8b98c555ef0ae08a7bd22f5d36bd (diff) | |
| parent | b49fd495622b15f96faf944db1e70cbe9e7fe7c4 (diff) | |
| download | puppet-fb05ef3c96038d67a46eb142202af186ad6cb0b3.tar.gz puppet-fb05ef3c96038d67a46eb142202af186ad6cb0b3.tar.xz puppet-fb05ef3c96038d67a46eb142202af186ad6cb0b3.zip | |
Merge branch '0.24.x'
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 0f01c2ee2..eed1a00f3 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -128,7 +128,7 @@ module Puppet This is more useful as a server-side setting than client, but any environment chosen must be in this list. Values should be separated by a comma."], - :environment => {:default => "development", :desc => "The environment Puppet is running in. For clients + :environment => {:default => "production", :desc => "The environment Puppet is running in. For clients (e.g., ``puppetd``) this determines the environment itself, which is used to find modules and much more. For servers (i.e., ``puppetmasterd``) this provides the default environment for nodes |