Merge lp://qastaging/~thedac/charms/trusty/percona-cluster/ch-sync-and-fix into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next
Proposed by
David Ames
| Status: | Merged |
|---|---|
| Merged at revision: | 85 |
| Proposed branch: | lp://qastaging/~thedac/charms/trusty/percona-cluster/ch-sync-and-fix |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next |
| Diff against target: |
1550 lines (+652/-166) 17 files modified
charmhelpers/cli/__init__.py (+3/-3) charmhelpers/contrib/charmsupport/nrpe.py (+52/-14) charmhelpers/contrib/network/ip.py (+26/-22) charmhelpers/core/hookenv.py (+84/-4) charmhelpers/core/host.py (+95/-22) charmhelpers/core/hugepage.py (+10/-1) charmhelpers/core/services/helpers.py (+14/-5) charmhelpers/core/strutils.py (+30/-0) charmhelpers/core/templating.py (+21/-8) charmhelpers/fetch/__init__.py (+10/-2) charmhelpers/fetch/archiveurl.py (+1/-1) charmhelpers/fetch/bzrurl.py (+22/-32) charmhelpers/fetch/giturl.py (+19/-24) tests/charmhelpers/contrib/amulet/utils.py (+47/-16) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+108/-4) tests/charmhelpers/contrib/openstack/amulet/utils.py (+26/-4) tests/charmhelpers/core/hookenv.py (+84/-4) |
| To merge this branch: | bzr merge lp://qastaging/~thedac/charms/trusty/percona-cluster/ch-sync-and-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Charm helpers synx
And fix bug#1535917
Make the service_running status check cover percona-cluster's unique status message.
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #17722 percona-
LINT OK: passed
Build: http://