Merge lp://staging/~gandelman-a/ubuntu/lucid/facter/732953_fixregress into lp://staging/ubuntu/lucid-proposed/facter
Proposed by
Adam Gandelman
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 14 | ||||
Proposed branch: | lp://staging/~gandelman-a/ubuntu/lucid/facter/732953_fixregress | ||||
Merge into: | lp://staging/ubuntu/lucid-proposed/facter | ||||
Diff against target: |
28 lines (+10/-1) 2 files modified
debian/changelog (+7/-0) lib/facter/ec2.rb (+3/-1) |
||||
To merge this branch: | bzr merge lp://staging/~gandelman-a/ubuntu/lucid/facter/732953_fixregress | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Development Team | Pending | ||
Review via email: mp+81483@code.staging.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.