Merge lp://qastaging/~gnuoy/charms/trusty/cinder-ceph/1453940-stable into lp://qastaging/~openstack-charmers-archive/charms/precise/cinder-ceph/trunk
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 36 |
Proposed branch: | lp://qastaging/~gnuoy/charms/trusty/cinder-ceph/1453940-stable |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/cinder-ceph/trunk |
Diff against target: |
751 lines (+357/-82) 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/cinder_hooks.py (+13/-22) tests/basic_deployment.py (+52/-8) unit_tests/test_cinder_hooks.py (+19/-3) |
To merge this branch: | bzr merge lp://qastaging/~gnuoy/charms/trusty/cinder-ceph/1453940-stable |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Glass (community) | Approve | ||
Ryan Beisner (community) | Needs Fixing | ||
Review via email:
|
To post a comment you must log in.
charm_unit_test #9552 cinder-ceph for gnuoy mp271261
UNIT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_unit_ test/9552/