diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-11 17:36:32 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-11 17:36:32 +0000 |
| commit | a3849d713e44e6f3037f146990d9568e51cea13e (patch) | |
| tree | 3c6a66e612b1232b4cc02b720966bc89b060b287 /lib/puppet/networkclient.rb | |
| parent | 86a92de183232a986f0c53820576f364711477a6 (diff) | |
| download | puppet-a3849d713e44e6f3037f146990d9568e51cea13e.tar.gz puppet-a3849d713e44e6f3037f146990d9568e51cea13e.tar.xz puppet-a3849d713e44e6f3037f146990d9568e51cea13e.zip | |
Fixing templating bug that can result in what looks like an infinite loop, and changing default timeout to 2 minutes instead of 30 seconds
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1385 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/networkclient.rb')
| -rw-r--r-- | lib/puppet/networkclient.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/networkclient.rb b/lib/puppet/networkclient.rb index d6975c5c2..fa5a21957 100644 --- a/lib/puppet/networkclient.rb +++ b/lib/puppet/networkclient.rb @@ -136,7 +136,8 @@ module Puppet nil, # proxy_port nil, # user nil, # password - true # use_ssl + true, # use_ssl + 120 # a two minute timeout, instead of 30 seconds ) if hash[:Certificate] |