diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-14 15:24:19 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-14 15:24:32 -0700 |
| commit | 21efa7b282080c69760a17576dff60c01821a963 (patch) | |
| tree | 8874c587d6932f49b0588caaa78149083231d947 /lib/puppet/util/command_line/puppetmasterd | |
| parent | 9caa04fd36353f02b5e3e1d343f04a62ba640f64 (diff) | |
| parent | 91185c6c04dc2bb5659db8f7a7d23a41c4d308ea (diff) | |
| download | puppet-21efa7b282080c69760a17576dff60c01821a963.tar.gz puppet-21efa7b282080c69760a17576dff60c01821a963.tar.xz puppet-21efa7b282080c69760a17576dff60c01821a963.zip | |
Merge branch 'master' into next
This is the code for 2.6 RC3
Diffstat (limited to 'lib/puppet/util/command_line/puppetmasterd')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetmasterd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd index c58612c0f..74efb3818 100755 --- a/lib/puppet/util/command_line/puppetmasterd +++ b/lib/puppet/util/command_line/puppetmasterd @@ -21,7 +21,7 @@ # parameter, so you can specify '--ssldir <directory>' as an argument. # # See the configuration file documentation at -# http://reductivelabs.com/trac/puppet/wiki/ConfigurationReference for +# http://docs.puppetlabs.com/references/stable/configuration.html for # the full list of acceptable parameters. A commented list of all # configuration options can also be generated by running puppetmasterdd with # '--genconfig'. |