summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/xmlrpc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/network/xmlrpc')
-rw-r--r--lib/puppet/network/xmlrpc/client.rb2
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