Merge lp://qastaging/~xianghui/ubuntu/trusty/oslo.messaging/lp1318721 into lp://qastaging/ubuntu/trusty-proposed/oslo.messaging
Proposed by
Xiang Hui
| Status: | Merged |
|---|---|
| Merge reported by: | Marc Deslauriers |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~xianghui/ubuntu/trusty/oslo.messaging/lp1318721 |
| Merge into: | lp://qastaging/ubuntu/trusty-proposed/oslo.messaging |
| Diff against target: |
992 lines (+936/-1) 6 files modified
.pc/applied-patches (+1/-0) .pc/fix-reconnect-race-condition-with-rabbitmq-cluster.patch/oslo/messaging/_drivers/impl_rabbit.py (+834/-0) debian/changelog (+8/-0) debian/patches/fix-reconnect-race-condition-with-rabbitmq-cluster.patch (+78/-0) debian/patches/series (+1/-0) oslo/messaging/_drivers/impl_rabbit.py (+14/-1) |
| To merge this branch: | bzr merge lp://qastaging/~xianghui/ubuntu/trusty/oslo.messaging/lp1318721 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Xiang Hui (xianghui) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
* Backport upstream release. (LP: #1318721)
- d/p/fix-
Redeclare if exception is catched after self.queue.