Merge lp:~gandelman-a/ubuntu/natty/facter/732953_fixregress into lp:ubuntu/natty-proposed/facter
Proposed by
Adam Gandelman
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 17 | ||||
Proposed branch: | lp:~gandelman-a/ubuntu/natty/facter/732953_fixregress | ||||
Merge into: | lp:ubuntu/natty-proposed/facter | ||||
Diff against target: |
58 lines (+20/-5) 3 files modified
debian/changelog (+8/-0) debian/patches/fix_ec2_metadata_facts.patch (+9/-4) lib/facter/ec2.rb (+3/-1) |
||||
To merge this branch: | bzr merge lp:~gandelman-a/ubuntu/natty/facter/732953_fixregress | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Development Team | Pending | ||
Review via email: mp+81487@code.launchpad.net |
Description of the change
Fixes a regression introduced in last SRU where timeouts are not being properly rescued.
To post a comment you must log in.