Merge lp://qastaging/~gnuoy/charms/trusty/nova-compute/1453940 into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 157 |
Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/nova-compute/1453940 |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
1252 lines (+866/-91) 7 files modified
hooks/charmhelpers/contrib/openstack/context.py (+8/-9) hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2) hooks/nova_compute_hooks.py (+14/-23) tests/charmhelpers/contrib/amulet/utils.py (+234/-52) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+20/-5) tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0) unit_tests/test_nova_compute_hooks.py (+7/-0) |
To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/nova-compute/1453940 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Edward Hope-Morley | Approve | ||
Review via email: mp+269377@code.qastaging.launchpad.net |
To post a comment you must log in.
charm_lint_check #9592 nova-compute-next for gnuoy mp269377
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/9592/