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 |
Related bugs: |
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.
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/