diff options
| author | Matthew Kent <mkent@magoazul.com> | 2012-10-24 23:55:02 -0700 |
|---|---|---|
| committer | Matthew Kent <mkent@magoazul.com> | 2012-10-24 23:55:02 -0700 |
| commit | 5199c45dfbdfa9919aaa3a64535d8216c27b7948 (patch) | |
| tree | 5fee46cb534a93c92456a8662064e752ef890af7 | |
| parent | 15e23eec2daae75a61c7d29c7af3f489d9278248 (diff) | |
| download | mixlib-shellout-5199c45dfbdfa9919aaa3a64535d8216c27b7948.tar.gz | |
MIXLIB_SHELLOUT-02: Fix comments about default timeout to avoid confusion.
| -rw-r--r-- | lib/mixlib/shellout.rb | 2 | ||||
| -rw-r--r-- | lib/mixlib/shellout/unix.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mixlib/shellout.rb b/lib/mixlib/shellout.rb index 8e8b7ea..3b2651c 100644 --- a/lib/mixlib/shellout.rb +++ b/lib/mixlib/shellout.rb @@ -213,7 +213,7 @@ module Mixlib # * Errno::ENOENT when the command is not available on the system (or not # in the current $PATH) # * CommandTimeout when the command does not complete - # within +timeout+ seconds (default: 60s) + # within +timeout+ seconds (default: 600s) def run_command if logger log_message = (log_tag.nil? ? "" : "#@log_tag ") << "sh(#@command)" diff --git a/lib/mixlib/shellout/unix.rb b/lib/mixlib/shellout/unix.rb index 2788db5..a983e05 100644 --- a/lib/mixlib/shellout/unix.rb +++ b/lib/mixlib/shellout/unix.rb @@ -30,7 +30,7 @@ module Mixlib # * Errno::ENOENT when the command is not available on the system (or not # in the current $PATH) # * Chef::Exceptions::CommandTimeout when the command does not complete - # within +timeout+ seconds (default: 60s) + # within +timeout+ seconds (default: 600s) def run_command @child_pid = fork_subprocess |