diff options
| author | Luke Kanies <luke@madstop.com> | 2008-04-21 23:45:53 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-04-21 23:45:53 -0500 |
| commit | 0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1 (patch) | |
| tree | 0bcf46830c65667ebf85e44f8699243f8da5a5f3 /lib/puppet/network/xmlrpc/client.rb | |
| parent | 58fb416e9f52a9dc834b735ffa7e5c425495c982 (diff) | |
| parent | 62ca72608c8fcded624c46c6951b9381a7284a80 (diff) | |
| download | puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.tar.gz puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.tar.xz puppet-0e8a1c9f6ac45e9e6f6dcf6464ad4d2780201ce1.zip | |
Merge branch '0.24.x'
Conflicts:
bin/puppetca
Diffstat (limited to 'lib/puppet/network/xmlrpc/client.rb')
| -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 |