Code Review / packages / precise / mcollective.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update version according to OSCI-883
[packages/precise/mcollective.git] / lib / mcollective / rpc / agent.rb
diff --git a/lib/mcollective/rpc/agent.rb b/lib/mcollective/rpc/agent.rb
index 857cc76fc4d736b35b5aeabc2bfd149ba2b3aa9b..49a9b3a27bfb2bb6ee6c258c059ee2765bbedfb9 100644 (file)
--- a/lib/mcollective/rpc/agent.rb
+++ b/lib/mcollective/rpc/agent.rb
@@ -215,7 +215,7 @@ module MCollective
           end
         end
 
-        [:stdin, :cwd, :environment].each do |k|
+        [:stdin, :cwd, :environment, :timeout].each do |k|
           if options.include?(k)
             shellopts[k] = options[k]
           end