Merge lp://staging/~james-page/charms/trusty/neutron-api/stable-bug-1413862 into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk

Proposed by James Page
Status: Merged
Merged at revision: 74
Proposed branch: lp://staging/~james-page/charms/trusty/neutron-api/stable-bug-1413862
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Diff against target: 63 lines (+13/-7)
3 files modified
charm-helpers-sync.yaml (+1/-1)
hooks/charmhelpers/contrib/openstack/context.py (+1/-1)
hooks/charmhelpers/core/sysctl.py (+11/-5)
To merge this branch: bzr merge lp://staging/~james-page/charms/trusty/neutron-api/stable-bug-1413862
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+251901@code.staging.launchpad.net

Commit message

Resync helpers to resolve race condition when access-network is set in mysql or percona-cluster charms

Description of the change

Resync helpers to resolve race condition when access-network is set in mysql or percona-cluster charms

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #2478 neutron-api for james-page mp251901
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2478/

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

charm_unit_test #2268 neutron-api for james-page mp251901
    UNIT OK: passed

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

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

charm_amulet_test #2351 neutron-api for james-page mp251901
    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/10538300/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2351/

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