summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-08 11:28:34 -0600
committerLuke Kanies <luke@madstop.com>2007-11-08 11:28:34 -0600
commitf465e7e96d62f9b18bdebd51319582d5b2ffa332 (patch)
treec33a94d5430d42a702735554c2110c149eae349d /lib/puppet/network
parent65858356cb3170e04200a6d8204f0978223e2c61 (diff)
parent1ffcce079fd7a677ebdc22453a9d10675fb4ed4d (diff)
downloadpuppet-f465e7e96d62f9b18bdebd51319582d5b2ffa332.tar.gz
puppet-f465e7e96d62f9b18bdebd51319582d5b2ffa332.tar.xz
puppet-f465e7e96d62f9b18bdebd51319582d5b2ffa332.zip
Merge branch 'rest'
Diffstat (limited to 'lib/puppet/network')
-rw-r--r--lib/puppet/network/xmlrpc/client.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index c652dbf8d..ab4117b0e 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -128,12 +128,12 @@ module Puppet::Network
120 # a two minute timeout, instead of 30 seconds
)
- # We overwrite the uninitialized @http here with a cached one.
+ # We overwrite the uninitialized @http here with a cached one.
key = "%s%s" % [hash[:Server], hash[:Port]]
if @@http_cache[key]
- @http = @@http_cache[key]
+ @http = @@http_cache[key]
else
- @@http_cache[key] = @http
+ @@http_cache[key] = @http
end
end
@@ -150,4 +150,3 @@ module Puppet::Network
end
end
end
-