diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-01 16:05:51 -0800 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-02-01 16:05:51 -0800 |
| commit | 90f84fd613c6128ecc786fd40269f043474df1c5 (patch) | |
| tree | c9699b2d3b3da9eb13cc4e7d52716bbc5e699de8 | |
| parent | b29f86487581d89016b63f5f7780b15d2ec8573e (diff) | |
| parent | f279f2c24ad1c87940eca3592f4c6e2f5676c694 (diff) | |
| download | puppet-90f84fd613c6128ecc786fd40269f043474df1c5.tar.gz puppet-90f84fd613c6128ecc786fd40269f043474df1c5.tar.xz puppet-90f84fd613c6128ecc786fd40269f043474df1c5.zip | |
Merge commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694' into 2.6.next
* commit 'f279f2c24ad1c87940eca3592f4c6e2f5676c694':
Fixed #4968 - Updated list of options turned on by --test in documentation
| -rwxr-xr-x | lib/puppet/util/command_line/puppetd | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line/puppetd b/lib/puppet/util/command_line/puppetd index cb8589c5f..7d78ce90f 100755 --- a/lib/puppet/util/command_line/puppetd +++ b/lib/puppet/util/command_line/puppetd @@ -150,7 +150,8 @@ # # test:: # Enable the most common options used for testing. These are +onetime+, -# +verbose+, +ignorecache, +no-daemonize+, and +no-usecacheonfailure+. +# +verbose+, +ignorecache, +no-daemonize+, +no-usecacheonfailure+, +# +detailed-exit-codes+, +no-splay+, and +show_diff+. # # noop:: # Use +noop+ mode where the daemon runs in a no-op or dry-run mode. This is useful |