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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
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/ 10.245. 162.77: 8080/job/ charm_lint_ check/16667/
Build: http://