Merge lp://qastaging/~thedac/charms/trusty/rabbitmq-server/backport-cluster-race-fixes into lp://qastaging/charms/trusty/rabbitmq-server

Proposed by David Ames
Status: Merged
Merged at revision: 102
Proposed branch: lp://qastaging/~thedac/charms/trusty/rabbitmq-server/backport-cluster-race-fixes
Merge into: lp://qastaging/charms/trusty/rabbitmq-server
Diff against target: 107 lines (+36/-11)
2 files modified
hooks/rabbit_utils.py (+6/-1)
hooks/rabbitmq_server_relations.py (+30/-10)
To merge this branch: bzr merge lp://qastaging/~thedac/charms/trusty/rabbitmq-server/backport-cluster-race-fixes
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+270712@code.qastaging.launchpad.net

Description of the change

Backport cluster race conditions fix from next to the stable charm fixing LP Bug#1486177

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8949 rabbitmq-server for thedac mp270712
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8949/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9718 rabbitmq-server for thedac mp270712
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12329593/
Build: http://10.245.162.77:8080/job/charm_lint_check/9718/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6348 rabbitmq-server for thedac mp270712
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12329701/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6348/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve, (amulet fixes to follow).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches