Merge lp://qastaging/~hopem/charms/trusty/percona-cluster/fix-peerstore-passwd-lp1451890 into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 57
Proposed branch: lp://qastaging/~hopem/charms/trusty/percona-cluster/fix-peerstore-passwd-lp1451890
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next
Diff against target: 320 lines (+108/-26)
9 files modified
hooks/charmhelpers/contrib/charmsupport/nrpe.py (+3/-1)
hooks/charmhelpers/contrib/database/mysql.py (+32/-11)
hooks/charmhelpers/core/hookenv.py (+40/-1)
hooks/charmhelpers/core/host.py (+5/-1)
hooks/charmhelpers/core/services/helpers.py (+2/-2)
hooks/charmhelpers/core/strutils.py (+2/-2)
hooks/charmhelpers/core/unitdata.py (+1/-1)
tests/charmhelpers/contrib/amulet/utils.py (+8/-1)
tests/charmhelpers/contrib/openstack/amulet/deployment.py (+15/-6)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/percona-cluster/fix-peerstore-passwd-lp1451890
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+258376@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #4134 percona-cluster-next for hopem mp258376
    UNIT OK: passed

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

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

charm_lint_check #4409 percona-cluster-next for hopem mp258376
    LINT FAIL: lint-test failed

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

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

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

charm_amulet_test #4008 percona-cluster-next for hopem mp258376
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

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

I've tested that this branch does not contain the upgrade bug. Lint seems to be osci specific. +1

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