Merge lp://qastaging/~gnuoy/charms/trusty/percona-cluster/1454317 into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next
Proposed by
Liam Young
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/percona-cluster/1454317 |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/next |
Diff against target: |
501 lines (+210/-40) 11 files modified
charm-helpers-hooks.yaml (+1/-1) charmhelpers/contrib/database/mysql.py (+21/-6) charmhelpers/contrib/network/ip.py (+5/-3) charmhelpers/core/hookenv.py (+32/-0) charmhelpers/core/hugepage.py (+8/-1) charmhelpers/core/strutils.py (+30/-0) hooks/percona_hooks.py (+21/-3) hooks/percona_utils.py (+12/-9) tests/charmhelpers/contrib/amulet/utils.py (+47/-16) tests/charmhelpers/contrib/openstack/amulet/utils.py (+1/-1) tests/charmhelpers/core/hookenv.py (+32/-0) |
To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/percona-cluster/1454317 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Edward Hope-Morley | Needs Resubmitting | ||
Mario Splivalo (community) | Approve | ||
OpenStack Charmers | Pending | ||
Review via email: mp+258981@code.qastaging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 65. By Liam Young
-
Fix typos and lint
- 64. By Liam Young
-
Rebase changes
- 63. By Liam Young
-
Merged next in
- 62. By Liam Young
-
Only add passwords to the peer relation if the unit is clustered, the leader and remove stale passwords after a slave sync. Also replace eligible_leader with is_elected_leader as eligible_leader is deprecated
- 61. By Liam Young
-
Sync charmhelpers with db fixes
charm_unit_test #4246 percona- cluster- next for gnuoy mp258981
UNIT FAIL: unit-test failed
UNIT Results (max last 2 lines):
make: *** [unit_test] Error 1
ERROR:root:Make target returned non-zero.
Full unit test output: http:// paste.ubuntu. com/11115163/ 10.245. 162.77: 8080/job/ charm_unit_ test/4246/
Build: http://