diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-10-13 15:27:24 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-10-13 15:27:24 -0700 |
| commit | c2e1596fe2844fb22bebb96b4908bd0d8b6fcd35 (patch) | |
| tree | 4421618c645ce8c68fb4cbc4b60a3812440b9f4f | |
| parent | 3af9a51d13a79dced9acdfc748b1d75e7a45f13a (diff) | |
| parent | 06dd92339b2b4c1f3378166759c08eca4b10a10d (diff) | |
| download | ohai-c2e1596fe2844fb22bebb96b4908bd0d8b6fcd35.tar.gz | |
Merge pull request #379 from carck/master
this blocks chef-solo for 10 minutes
| -rw-r--r-- | lib/ohai/mixin/gce_metadata.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai/mixin/gce_metadata.rb b/lib/ohai/mixin/gce_metadata.rb index 04334880..a3d57ade 100644 --- a/lib/ohai/mixin/gce_metadata.rb +++ b/lib/ohai/mixin/gce_metadata.rb @@ -51,7 +51,7 @@ module Ohai end def http_client - Net::HTTP.start(GCE_METADATA_ADDR).tap {|h| h.read_timeout = 600} + Net::HTTP.start(GCE_METADATA_ADDR).tap {|h| h.read_timeout = 6} end def fetch_metadata(id='') |