Merge lp://staging/~smoser/ubuntu/precise/apport/ec2-metadata-timeout into lp://staging/~ubuntu-core-dev/ubuntu/precise/apport/ubuntu
Proposed by
Scott Moser
| Status: | Merged |
|---|---|
| Merged at revision: | 1931 |
| Proposed branch: | lp://staging/~smoser/ubuntu/precise/apport/ec2-metadata-timeout |
| Merge into: | lp://staging/~ubuntu-core-dev/ubuntu/precise/apport/ubuntu |
| Diff against target: |
41 lines (+9/-3) 2 files modified
data/general-hooks/ubuntu.py (+3/-2) debian/changelog (+6/-1) |
| To merge this branch: | bzr merge lp://staging/~smoser/ubuntu/precise/apport/ec2-metadata-timeout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
|
Review via email:
|
|||
Description of the change
timeout on attempts to contact ec2 metadata service
Instead of hanging forever, timeout after 5 seconds. Any reasonable metadata service would come back in that amount of time.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks!