Merge lp://staging/~gnuoy/charms/trusty/nova-compute/1496746 into lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 158 |
Proposed branch: | lp://staging/~gnuoy/charms/trusty/nova-compute/1496746 |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
1265 lines (+810/-65) 17 files modified
hooks/charmhelpers/contrib/network/ufw.py (+5/-6) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0) hooks/charmhelpers/contrib/openstack/context.py (+52/-7) hooks/charmhelpers/contrib/openstack/templating.py (+28/-1) hooks/charmhelpers/contrib/openstack/utils.py (+177/-1) hooks/charmhelpers/contrib/storage/linux/ceph.py (+2/-11) hooks/charmhelpers/core/host.py (+32/-16) hooks/charmhelpers/core/hugepage.py (+8/-1) hooks/charmhelpers/core/kernel.py (+68/-0) hooks/charmhelpers/core/strutils.py (+30/-0) hooks/nova_compute_utils.py (+1/-0) metadata.yaml (+1/-1) tests/charmhelpers/contrib/amulet/deployment.py (+4/-2) tests/charmhelpers/contrib/amulet/utils.py (+9/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+9/-10) unit_tests/test_nova_compute_utils.py (+2/-0) |
To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/nova-compute/1496746 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Glass (community) | Approve | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #10188 nova-compute-next for gnuoy mp271451
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/12437437/ 10.245. 162.77: 8080/job/ charm_lint_ check/10188/
Build: http://