diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-03-22 19:23:32 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-03-22 19:23:32 +1100 |
| commit | 3875b5ba9014a6ba540e51e0ffb411d58aa521e4 (patch) | |
| tree | 094a8de1c27ece0acb7b6d21dc8dbd91a95de10b | |
| parent | 696ba50accc6a5b99180d5284ea729107daec080 (diff) | |
| parent | a29c7fd408b8b1e00410f5bbd82ff5e626381667 (diff) | |
| download | puppet-3875b5ba9014a6ba540e51e0ffb411d58aa521e4.tar.gz puppet-3875b5ba9014a6ba540e51e0ffb411d58aa521e4.tar.xz puppet-3875b5ba9014a6ba540e51e0ffb411d58aa521e4.zip | |
Merge branch 'tickets/2.6.x/6562' into 2.6.next
* tickets/2.6.x/6562:
Fixed #6562 - Minor kick documentation fix
| -rwxr-xr-x | lib/puppet/util/command_line/puppetrun | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/util/command_line/puppetrun b/lib/puppet/util/command_line/puppetrun index 7eba3b2c4..3437405b0 100755 --- a/lib/puppet/util/command_line/puppetrun +++ b/lib/puppet/util/command_line/puppetrun @@ -107,7 +107,6 @@ # option requires LDAP support at this point. # # ping:: -# # Do a ICMP echo against the target host. Skip hosts that don't respond to ping. # # = Example |