Merge lp://qastaging/~corey.bryant/charms/trusty/ceilometer/aodh into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/next

Proposed by Corey Bryant
Status: Merged
Merged at revision: 110
Proposed branch: lp://qastaging/~corey.bryant/charms/trusty/ceilometer/aodh
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceilometer/next
Diff against target: 245 lines (+71/-29)
5 files modified
actions/actions.py (+7/-3)
lib/ceilometer_utils.py (+47/-16)
unit_tests/test_actions_openstack_upgrade.py (+2/-1)
unit_tests/test_ceilometer_hooks.py (+5/-4)
unit_tests/test_ceilometer_utils.py (+10/-5)
To merge this branch: bzr merge lp://qastaging/~corey.bryant/charms/trusty/ceilometer/aodh
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+281779@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 #16667 ceilometer-next for corey.bryant mp281779
    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/14423180/
Build: http://10.245.162.77:8080/job/charm_lint_check/16667/

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

charm_unit_test #15564 ceilometer-next for corey.bryant mp281779
    UNIT OK: passed

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

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

charm_amulet_test #8542 ceilometer-next for corey.bryant mp281779
    AMULET FAIL: amulet-test failed

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

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

111. By Corey Bryant

Lint fixes for aodh-notifier and aodh-evaluator updates

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

charm_lint_check #16669 ceilometer-next for corey.bryant mp281779
    LINT OK: passed

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

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

charm_unit_test #15566 ceilometer-next for corey.bryant mp281779
    UNIT OK: passed

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

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

charm_amulet_test #8543 ceilometer-next for corey.bryant mp281779
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8543/

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

charm_amulet_test #8545 ceilometer-next for corey.bryant mp281779
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8545/

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

approved

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