Merge lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/fixup-allowedunits-migration into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by James Page
Status: Merged
Merged at revision: 160
Proposed branch: lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/fixup-allowedunits-migration
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 51 lines (+15/-13)
2 files modified
hooks/nova_cc_hooks.py (+12/-11)
unit_tests/test_nova_cc_hooks.py (+3/-2)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/fixup-allowedunits-migration
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Adam Collard (community) Approve
Review via email: mp+256959@code.qastaging.launchpad.net
To post a comment you must log in.
161. By James Page

Drop errant log message

Revision history for this message
Adam Collard (adam-collard) :
review: Approve
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3689 nova-cloud-controller-next for james-page mp256959
    LINT OK: passed

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

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

charm_unit_test #3476 nova-cloud-controller-next for james-page mp256959
    UNIT OK: passed

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

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

charm_amulet_test #3484 nova-cloud-controller-next for james-page mp256959
    AMULET FAIL: amulet-test failed

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

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

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