Merge lp://qastaging/~hopem/charms/trusty/neutron-api/charm-helpers-sync into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 74
Proposed branch: lp://qastaging/~hopem/charms/trusty/neutron-api/charm-helpers-sync
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 584 lines (+496/-13)
4 files modified
hooks/charmhelpers/core/host.py (+5/-5)
hooks/charmhelpers/core/sysctl.py (+11/-5)
hooks/charmhelpers/core/templating.py (+3/-3)
hooks/charmhelpers/core/unitdata.py (+477/-0)
To merge this branch: bzr merge lp://qastaging/~hopem/charms/trusty/neutron-api/charm-helpers-sync
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+249314@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1883 neutron-api-next for hopem mp249314
    LINT OK: passed

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

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

charm_unit_test #1714 neutron-api-next for hopem mp249314
    UNIT OK: passed

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

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

charm_amulet_test #1861 neutron-api-next for hopem mp249314
    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/10172902/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1861/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

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