diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 13:35:25 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 13:35:25 -0800 |
| commit | c1dab76032c2bc6ef374ca1aa5f9cb49b76c7326 (patch) | |
| tree | eb5d48d33dc9756cbc51f54c42bef9fb1689a323 /lib/puppet/util/command_line/puppetmasterd | |
| parent | 90f53f43e3bd263b37db673c08ba13c1b48b3ca6 (diff) | |
| parent | 4b6519a84378006b99f9b7c2fbc395ac2f4994c3 (diff) | |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
Updated CHANGELOG for 2.6.5rc3
Updated fix for #3646 - apply / compile documentation
Diffstat (limited to 'lib/puppet/util/command_line/puppetmasterd')
| -rwxr-xr-x | lib/puppet/util/command_line/puppetmasterd | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/puppet/util/command_line/puppetmasterd b/lib/puppet/util/command_line/puppetmasterd index 445169820..3b76db82b 100755 --- a/lib/puppet/util/command_line/puppetmasterd +++ b/lib/puppet/util/command_line/puppetmasterd @@ -9,7 +9,7 @@ # # puppet master [-D|--daemonize|--no-daemonize] [-d|--debug] [-h|--help] # [-l|--logdest <file>|console|syslog] [-v|--verbose] [-V|--version] -# [--compile <nodename>] [--apply <catalog>] +# [--compile <nodename>] # # = Description # @@ -54,10 +54,6 @@ # Capability to compile a catalogue and output it in JSON from the Puppet master. Uses # facts contained in the $vardir/yaml/ directory to compile the catalog. # -# apply:: -# Capability to apply JSON catalog (such as one generated with --compile). You can either specify -# a JSON file or pipe in JSON from standard input. -# # = Example # # puppet master |