summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-01-13 13:48:07 -0800
committerGitHub <noreply@github.com>2017-01-13 13:48:07 -0800
commit5e20797a02329e3769ced4bec3262951bed5b632 (patch)
tree1583c08ad579eb47b034c090df54123dedcb25b8
parent7f33f2b2f47f95beb485123f01469dbe2034d35b (diff)
parent3e6fea08c3d5094450b27d3e5c7b0f8aa1419fef (diff)
downloadmixlib-shellout-5e20797a02329e3769ced4bec3262951bed5b632.tar.gz
Merge pull request #133 from chef/fix_timeout_commment
Fix the timeout in the comment to be correct
-rw-r--r--lib/mixlib/shellout.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mixlib/shellout.rb b/lib/mixlib/shellout.rb
index d15b645..3f1106f 100644
--- a/lib/mixlib/shellout.rb
+++ b/lib/mixlib/shellout.rb
@@ -133,7 +133,7 @@ module Mixlib
# * +timeout+: a Numeric value for the number of seconds to wait on the
# child process before raising an Exception. This is calculated as the
# total amount of time that ShellOut waited on the child process without
- # receiving any output (i.e., IO.select returned nil). Default is 60
+ # receiving any output (i.e., IO.select returned nil). Default is 600
# seconds. Note: the stdlib Timeout library is not used.
# * +input+: A String of data to be passed to the subcommand. This is
# written to the child process' stdin stream before the process is