Merge lp://qastaging/~gnuoy/charms/trusty/percona-cluster/use-dc-stable into lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/trunk

Proposed by Liam Young
Status: Merged
Merged at revision: 61
Proposed branch: lp://qastaging/~gnuoy/charms/trusty/percona-cluster/use-dc-stable
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/percona-cluster/trunk
Diff against target: 96 lines (+29/-4)
2 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0)
hooks/percona_hooks.py (+4/-4)
To merge this branch: bzr merge lp://qastaging/~gnuoy/charms/trusty/percona-cluster/use-dc-stable
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+261372@code.qastaging.launchpad.net
To post a comment you must log in.
62. By Liam Young

Revert unconnected charmhelpers/contrib/database/mysql.py

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #5123 percona-cluster for gnuoy mp261372
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/11648258/
Build: http://10.245.162.77:8080/job/charm_lint_check/5123/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #4802 percona-cluster for gnuoy mp261372
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/4802/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #4530 percona-cluster for gnuoy mp261372
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/11648285/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4530/

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: