Merge lp://qastaging/~james-page/charms/trusty/cinder-ceph/lp1535062-stable into lp://qastaging/~openstack-charmers-archive/charms/precise/cinder-ceph/trunk
Proposed by
James Page
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 40 | ||||
Proposed branch: | lp://qastaging/~james-page/charms/trusty/cinder-ceph/lp1535062-stable | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/cinder-ceph/trunk | ||||
Diff against target: |
572 lines (+286/-26) 7 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) hooks/charmhelpers/contrib/openstack/utils.py (+22/-17) hooks/charmhelpers/core/host.py (+12/-1) hooks/charmhelpers/core/hugepage.py (+2/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/cinder-ceph/lp1535062-stable | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
charmers | Pending | ||
Review via email: mp+283188@code.qastaging.launchpad.net |
To post a comment you must log in.
charm_lint_check #17720 cinder-ceph for james-page mp283188
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/17720/