Merge lp://staging/~gnuoy/charms/trusty/nova-compute/1453940-stable into lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 137 |
Proposed branch: | lp://staging/~gnuoy/charms/trusty/nova-compute/1453940-stable |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/trunk |
Diff against target: |
634 lines (+295/-73) 12 files modified
hooks/charmhelpers/cli/__init__.py (+1/-5) hooks/charmhelpers/cli/commands.py (+4/-4) hooks/charmhelpers/cli/hookenv.py (+23/-0) hooks/charmhelpers/contrib/openstack/context.py (+8/-9) hooks/charmhelpers/contrib/openstack/utils.py (+7/-5) hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2) hooks/charmhelpers/contrib/storage/linux/utils.py (+3/-2) hooks/charmhelpers/core/hookenv.py (+1/-20) hooks/charmhelpers/core/host.py (+2/-2) hooks/nova_compute_hooks.py (+14/-23) metadata.yaml (+1/-1) unit_tests/test_nova_compute_hooks.py (+7/-0) |
To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/nova-compute/1453940-stable |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Glass (community) | Approve | ||
Review via email: mp+271257@code.staging.launchpad.net |
To post a comment you must log in.
charm_lint_check #10407 nova-compute for gnuoy mp271257
LINT FAIL: lint-test failed
LINT FAIL: charm-proof failed
LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.
Full lint test output: http:// paste.ubuntu. com/12514277/ 10.245. 162.77: 8080/job/ charm_lint_ check/10407/
Build: http://