Merge lp://qastaging/~james-page/charms/trusty/rabbitmq-server/lp-1480893 into lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

Proposed by James Page
Status: Rejected
Rejected by: James Page
Proposed branch: lp://qastaging/~james-page/charms/trusty/rabbitmq-server/lp-1480893
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 96 lines (+37/-6)
3 files modified
hooks/charmhelpers/contrib/peerstorage/__init__.py (+5/-4)
hooks/charmhelpers/core/hookenv.py (+16/-1)
tests/charmhelpers/core/hookenv.py (+16/-1)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/rabbitmq-server/lp-1480893
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+266722@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-08-03.

Description of the change

Fixup issue with migration from peer storage to leader storage.

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

charm_unit_test #6934 rabbitmq-server-next for james-page mp266722
    UNIT OK: passed

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

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

charm_lint_check #7476 rabbitmq-server-next for james-page mp266722
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7476/

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

charm_amulet_test #5599 rabbitmq-server-next for james-page mp266722
    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/11998084/
Build: http://10.245.162.77:8080/job/charm_amulet_test/5599/

Unmerged revisions

103. By James Page

Resync helpers, resolving upgrades to leader-storage

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