Merge lp://qastaging/~hopem/charms/trusty/percona-cluster/contrib-database-mysql into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/trunk
Proposed by
Edward Hope-Morley
Status: | Merged |
---|---|
Merged at revision: | 45 |
Proposed branch: | lp://qastaging/~hopem/charms/trusty/percona-cluster/contrib-database-mysql |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/trunk |
Diff against target: |
1880 lines (+908/-484) 29 files modified
charm-helpers.yaml (+1/-0) hooks/charmhelpers/__init__.py (+16/-0) hooks/charmhelpers/contrib/__init__.py (+15/-0) hooks/charmhelpers/contrib/database/mysql.py (+372/-0) hooks/charmhelpers/contrib/hahelpers/__init__.py (+15/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+47/-13) hooks/charmhelpers/contrib/network/__init__.py (+15/-0) hooks/charmhelpers/contrib/network/ip.py (+16/-0) hooks/charmhelpers/contrib/peerstorage/__init__.py (+16/-0) hooks/charmhelpers/core/__init__.py (+15/-0) hooks/charmhelpers/core/decorators.py (+57/-0) hooks/charmhelpers/core/fstab.py (+16/-0) hooks/charmhelpers/core/hookenv.py (+16/-0) hooks/charmhelpers/core/host.py (+34/-7) hooks/charmhelpers/core/services/__init__.py (+16/-0) hooks/charmhelpers/core/services/base.py (+16/-0) hooks/charmhelpers/core/services/helpers.py (+16/-0) hooks/charmhelpers/core/sysctl.py (+27/-5) hooks/charmhelpers/core/templating.py (+19/-3) hooks/charmhelpers/fetch/__init__.py (+24/-1) hooks/charmhelpers/fetch/archiveurl.py (+16/-0) hooks/charmhelpers/fetch/bzrurl.py (+25/-1) hooks/charmhelpers/fetch/giturl.py (+20/-0) hooks/charmhelpers/payload/__init__.py (+16/-0) hooks/charmhelpers/payload/execd.py (+16/-0) hooks/mysql.py (+0/-368) hooks/percona_hooks.py (+31/-29) hooks/percona_utils.py (+15/-4) unit_tests/test_mysql.py (+0/-53) |
To merge this branch: | bzr merge lp://qastaging/~hopem/charms/trusty/percona-cluster/contrib-database-mysql |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+248742@code.qastaging.launchpad.net |
To post a comment you must log in.
Approve