Merge lp://staging/~tribaal/charms/trusty/ceph/sync-charm-helpers into lp://staging/~openstack-charmers-archive/charms/trusty/ceph/trunk

Proposed by Chris Glass
Status: Merged
Merged at revision: 73
Proposed branch: lp://staging/~tribaal/charms/trusty/ceph/sync-charm-helpers
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph/trunk
Diff against target: 465 lines (+229/-75)
5 files modified
hooks/ceph.py (+2/-5)
hooks/charmhelpers/contrib/storage/linux/utils.py (+19/-5)
hooks/charmhelpers/core/hookenv.py (+98/-1)
hooks/charmhelpers/core/host.py (+14/-0)
hooks/charmhelpers/fetch/__init__.py (+96/-64)
To merge this branch: bzr merge lp://staging/~tribaal/charms/trusty/ceph/sync-charm-helpers
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+220037@code.staging.launchpad.net

Description of the change

This branch syncs back the changes from charm-helpers as of http://bazaar.launchpad.net/~charm-helpers/charm-helpers/devel/revision/153?start_revid=153 into the charm.

Furthermore, the charm-helpers "is_device_mounted" function is used to prevent using mounted disks.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches