Merge lp:~ryan-a-lowe/percona-toolkit/percona-toolkit into lp:percona-toolkit/2.2

[Ryan Lowe]

--no-stalk forces --iterations=1

[Daniel Nichter (daniel-nichter)]

I changed the option and rewrote the docs, so this update was no longer needed.

Unmerged revisions

527. By Ryan Lowe on 2013-02-15

pt-stalk documentation to reflect that --no-stalk forces --iterations=1

=== modified file 'bin/pt-stalk'
--- bin/pt-stalk	2013-01-24 19:08:09 +0000
+++ bin/pt-stalk	2013-02-15 17:06:24 +0000
@@ -1841,7 +1841,8 @@
 Watch the server and wait for the trigger to occur.  You can negate this option
 to make the tool immediately gather any diagnostic data once and exit.  This is
 useful if a problem is already happening, but pt-stalk is not running, so
-you only want to collect diagnostic data.
+you only want to collect diagnostic data. Negating this option causes the 
+L<"--iterations"> option to be set to 1.
 
 If this option is negate, L<"--daemonize">, L<"--log">, L<"--pid">, and other
 stalking-related options have no effect; the tool simply collects diagnostic