Merge lp://qastaging/~1chb1n/charms/trusty/percona-cluster/liberty-prep into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next
Proposed by
Ryan Beisner
Status: | Merged |
---|---|
Merged at revision: | 72 |
Proposed branch: | lp://qastaging/~1chb1n/charms/trusty/percona-cluster/liberty-prep |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next |
Diff against target: |
809 lines (+342/-111) 17 files modified
Makefile (+8/-9) hooks/charmhelpers/cli/__init__.py (+1/-5) hooks/charmhelpers/cli/commands.py (+4/-4) hooks/charmhelpers/cli/hookenv.py (+23/-0) hooks/charmhelpers/core/hookenv.py (+1/-20) hooks/charmhelpers/core/host.py (+89/-13) hooks/charmhelpers/core/hugepage.py (+62/-0) hooks/charmhelpers/core/services/helpers.py (+18/-2) hooks/charmhelpers/fetch/__init__.py (+8/-0) metadata.yaml (+1/-1) tests/00-setup (+16/-29) tests/basic_deployment.py (+1/-1) tests/charmhelpers/contrib/amulet/utils.py (+84/-21) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+2/-2) tests/tests.yaml (+19/-0) unit_tests/test_percona_hooks.py (+3/-2) unit_tests/test_percona_utils.py (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~1chb1n/charms/trusty/percona-cluster/liberty-prep |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email:
|
Description of the change
Sync charm-helpers for liberty cloud archive support; Also update makefile, update c-h sync yaml, update tests dir, update amulet test dependencies - to be consistent with other os-charms. Clean up old existing lint in unit tests.
To post a comment you must log in.
charm_unit_test #8088 percona- cluster- next for 1chb1n mp269210
UNIT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_unit_ test/8088/