Merge lp://qastaging/~james-page/charms/trusty/neutron-api/bug.1391784 into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | 72 |
Proposed branch: | lp://qastaging/~james-page/charms/trusty/neutron-api/bug.1391784 |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
Diff against target: |
91 lines (+50/-2) 3 files modified
config.yaml (+12/-0) hooks/neutron_api_hooks.py (+6/-2) unit_tests/test_neutron_api_hooks.py (+32/-0) |
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/neutron-api/bug.1391784 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+241518@code.qastaging.launchpad.net |
To post a comment you must log in.
UOSCI bot says:
charm_amulet_test #384 neutron-api-next for james-page mp241518
AMULET FAIL: amulet-test missing
AMULET Results (max last 5 lines): jenkins/ workspace/ charm_amulet_ test
INFO:root:Workspace dir: /var/lib/
INFO:root:Reading file: Makefile
INFO:root:Searching for: ['@juju test']
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/8961120/ 10.98.191. 181:8080/ job/charm_ amulet_ test/384/
Build: http://