diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 14:04:43 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-14 14:04:43 -0800 |
| commit | 9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a (patch) | |
| tree | 44bbfc40ad3cf782c9b36fabbd6db4c405a267e4 /lib/puppet | |
| parent | c1dab76032c2bc6ef374ca1aa5f9cb49b76c7326 (diff) | |
| parent | 9e0f9c5cfecf4ff81724c048c5afe5a288fcc9b2 (diff) | |
| download | puppet-9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a.tar.gz puppet-9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a.tar.xz puppet-9b7b0f3ad87abc3a6fbb7ad128e942571cd3e71a.zip | |
Merge branch '2.6.x' into 2.6.next
* 2.6.x:
Updated CHANGELOG for 2.6.5rc4
(#3646) Fix the documentation fix for `puppet apply --apply`
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/util/command_line/puppet | 6 | ||||
| -rwxr-xr-x | lib/puppet/util/command_line/puppetd | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/puppet/util/command_line/puppet b/lib/puppet/util/command_line/puppet index e75b92af8..ba3d57c19 100755 --- a/lib/puppet/util/command_line/puppet +++ b/lib/puppet/util/command_line/puppet @@ -7,7 +7,7 @@ # = Usage # # puppet apply [-h|--help] [-V|--version] [-d|--debug] [-v|--verbose] [-e|--execute] -# [--detailed-exitcodes] [-l|--logdest <file>] <file> +# [--detailed-exitcodes] [-l|--logdest <file>] [--apply catalog] <file> # # = Description # @@ -53,6 +53,10 @@ # verbose:: # Print extra information. # +# apply:: +# Capability to apply JSON catalog (such as one generated with --compile on the Puppet master). +# You can either specify a JSON catalog file or pipe in JSON from standard input. +# # = Example # # puppet -l /tmp/manifest.log manifest.pp diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index d7d94ce09..b4eafb483 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -15,7 +15,6 @@ # [-o|--onetime] [--serve <handler>] [-t|--test] [--noop] # [--digest <digest>] [--fingerprint] [-V|--version] # [-v|--verbose] [-w|--waitforcert <seconds>] -# [--apply catalog] # # = Description # @@ -173,10 +172,6 @@ # client. You can turn off waiting for certificates by specifying a time # of 0. # -# apply:: -# Capability to apply JSON catalog (such as one generated with --compile on the Puppet master). -# You can either specify a JSON catalog file or pipe in JSON from standard input. -# # = Example # # puppet agent --server puppet.domain.com |