diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-04-19 21:51:27 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-04-19 21:51:27 +1000 |
| commit | a35450b147c8594d5bcae4facc938fe8143218f7 (patch) | |
| tree | b52270ea257688a96e5f1e39650f2d9a14539f94 /lib/puppet/network/xmlrpc | |
| parent | 57fd88be52d07cf1fc09bd213ce096100c95c502 (diff) | |
| download | puppet-a35450b147c8594d5bcae4facc938fe8143218f7.tar.gz puppet-a35450b147c8594d5bcae4facc938fe8143218f7.tar.xz puppet-a35450b147c8594d5bcae4facc938fe8143218f7.zip | |
Pushed patch for #1176 - configtimeout fix
Diffstat (limited to 'lib/puppet/network/xmlrpc')
| -rw-r--r-- | lib/puppet/network/xmlrpc/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb index 357a766a1..e0fb5a0ab 100644 --- a/lib/puppet/network/xmlrpc/client.rb +++ b/lib/puppet/network/xmlrpc/client.rb @@ -123,7 +123,7 @@ module Puppet::Network nil, # user nil, # password true, # use_ssl - 120 # a two minute timeout, instead of 30 seconds + Puppet[:configtimeout] # use configured timeout (#1176) ) @http = Puppet::Network::HttpPool.http_instance(@host, @port) end |