Merge lp://staging/~xianghui/ubuntu/trusty/oslo.messaging/juno-lp1318721 into lp://staging/~ubuntu-cloud-archive/ubuntu/trusty/oslo.messaging/juno
Proposed by
Xiang Hui
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~xianghui/ubuntu/trusty/oslo.messaging/juno-lp1318721 | ||||
| Merge into: | lp://staging/~ubuntu-cloud-archive/ubuntu/trusty/oslo.messaging/juno | ||||
| Diff against target: |
9657 lines (+9295/-23) 29 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) .pc/0001-Fix-_poll_connection-not-timeout-issue-1-2.patch/oslo/messaging/_drivers/amqpdriver.py (+444/-0) .pc/0001-Fix-_poll_connection-not-timeout-issue-1-2.patch/oslo/messaging/_drivers/common.py (+349/-0) .pc/0001-Fix-_poll_connection-not-timeout-issue-1-2.patch/oslo/messaging/_drivers/impl_rabbit.py (+821/-0) .pc/0002-Fix-_poll_connection-not-timeout-issue-2-2.patch/oslo/messaging/_drivers/common.py (+374/-0) .pc/0002-Fix-_poll_connection-not-timeout-issue-2-2.patch/tests/test_utils.py (+49/-0) .pc/0003-qpid-Always-auto-delete-queue-of-DirectConsumer.patch/oslo/messaging/_drivers/impl_qpid.py (+729/-0) .pc/0004-rabbit-redeclare-consumers-when-ack-requeue-fail.patch/oslo/messaging/_drivers/impl_rabbit.py (+832/-0) .pc/0004-rabbit-redeclare-consumers-when-ack-requeue-fail.patch/tests/drivers/test_impl_rabbit.py (+735/-0) .pc/0005-Fix-possible-usage-of-undefined-variable.patch/oslo/messaging/_drivers/impl_rabbit.py (+839/-0) .pc/0006-Declare-DirectPublisher-exchanges-with-passive-True.patch/oslo/messaging/_drivers/common.py (+374/-0) .pc/0006-Declare-DirectPublisher-exchanges-with-passive-True.patch/oslo/messaging/_drivers/impl_rabbit.py (+839/-0) .pc/0006-Declare-DirectPublisher-exchanges-with-passive-True.patch/tests/drivers/test_impl_rabbit.py (+756/-0) .pc/0006-Declare-DirectPublisher-exchanges-with-passive-True.patch/tests/test_utils.py (+64/-0) .pc/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch/oslo/messaging/_drivers/impl_rabbit.py (+865/-0) .pc/applied-patches (+8/-0) .pc/zmq-server-routing.patch/oslo/messaging/_drivers/impl_zmq.py (+995/-0) debian/changelog (+8/-0) debian/patches/0007-fix-reconnect-race-condition-with-rabbitmq-cluster.patch (+24/-0) debian/patches/series (+1/-0) oslo/messaging/_drivers/amqpdriver.py (+16/-8) oslo/messaging/_drivers/common.py (+26/-0) oslo/messaging/_drivers/impl_qpid.py (+0/-1) oslo/messaging/_drivers/impl_rabbit.py (+69/-12) oslo/messaging/_drivers/impl_zmq.py (+2/-0) tests/drivers/test_impl_rabbit.py (+41/-2) tests/test_utils.py (+32/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~xianghui/ubuntu/trusty/oslo.messaging/juno-lp1318721 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Cloud Archive Team | Pending | ||
|
Review via email:
|
|||
Description of the change
* Backport of upstream release. (LP: #1318721):-
- d/p/0007-
Redeclare if exception is catched after self.queue.
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
