Code Review
/
packages
/
precise
/
mcollective.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update code from https://github.com/dmi-try/marionette-collective
[packages/precise/mcollective.git]
/
plugins
/
mcollective
/
agent
/
discovery.rb
diff --git
a/plugins/mcollective/agent/discovery.rb
b/plugins/mcollective/agent/discovery.rb
index ede2ec4045bca7ea5d211a0c4572fae7f37566c5..3d5d5d39f4becfea40e5331201901a40ee2ea0dc 100644
(file)
--- a/
plugins/mcollective/agent/discovery.rb
+++ b/
plugins/mcollective/agent/discovery.rb
@@
-10,8
+10,6
@@
module MCollective
config = Config.instance.pluginconf
@timeout = 5
config = Config.instance.pluginconf
@timeout = 5
- @timeout = config["discovery.timeout"].to_i if config.include?("discovery.timeout")
-
@meta = {:license => "Apache License, Version 2",
:author => "R.I.Pienaar <rip@devco.net>",
:timeout => @timeout,
@meta = {:license => "Apache License, Version 2",
:author => "R.I.Pienaar <rip@devco.net>",
:timeout => @timeout,