Update version according to OSCI-856

[packages/precise/mcollective.git] / lib / mcollective / optionparser.rb

diff --git a/lib/mcollective/optionparser.rb b/lib/mcollective/optionparser.rb
index fdb02cc0af82d95ed3894f095315fdc7b8cb5ff6..85f32c0bbeff399184cac6d010af1f978c71f5a3 100644 (file)
--- a/lib/mcollective/optionparser.rb
+++ b/lib/mcollective/optionparser.rb
@@ -167,7 +167,15 @@ module MCollective
         raise "Cannot read the discovery file #{v}" unless File.readable?(v)
 
         @options[:discovery_method] = "flatfile"
-        @options[:discovery_options] = v
+        @options[:discovery_options] << v
+      end
+
+      @parser.on("--publish_timeout TIMEOUT", Integer, "Timeout for publishing requests to remote agents.") do |pt|
+        @options[:publish_timeout] = pt
+      end
+
+      @parser.on("--threaded", "Start publishing requests and receiving responses in threaded mode.") do |v|
+        @options[:threaded] = true
       end
     end