Merge lp://staging/~gnuoy/charms/trusty/ceph/1453940-stable into lp://staging/~openstack-charmers-archive/charms/trusty/ceph/trunk
Proposed by
Liam Young
Status: | Merged |
---|---|
Merged at revision: | 110 |
Proposed branch: | lp://staging/~gnuoy/charms/trusty/ceph/1453940-stable |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/ceph/trunk |
Diff against target: |
487 lines (+278/-38) 8 files modified
hooks/ceph_broker.py (+12/-2) hooks/charmhelpers/cli/__init__.py (+1/-5) hooks/charmhelpers/cli/commands.py (+4/-4) hooks/charmhelpers/cli/hookenv.py (+23/-0) hooks/charmhelpers/contrib/storage/linux/ceph.py (+224/-2) hooks/charmhelpers/core/hookenv.py (+1/-20) hooks/charmhelpers/core/host.py (+2/-2) hooks/hooks.py (+11/-3) |
To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/ceph/1453940-stable |
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 #10408 ceph for gnuoy mp271260
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/10408/