Merge lp://staging/~tribaal/charms/trusty/ceph/backport-apt-cache-fixes into lp://staging/~openstack-charmers-archive/charms/trusty/ceph/trunk

Proposed by Chris Glass
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp://staging/~tribaal/charms/trusty/ceph/backport-apt-cache-fixes
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph/trunk
Diff against target: 237 lines (+51/-43)
6 files modified
.bzrignore (+1/-0)
Makefile (+8/-2)
hooks/ceph.py (+25/-28)
hooks/charmhelpers/contrib/storage/linux/utils.py (+4/-0)
hooks/charmhelpers/core/host.py (+2/-6)
hooks/charmhelpers/fetch/__init__.py (+11/-7)
To merge this branch: bzr merge lp://staging/~tribaal/charms/trusty/ceph/backport-apt-cache-fixes
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+236068@code.staging.launchpad.net

Description of the change

This branch backports changes fixing https://bugs.launchpad.net/charms/+source/ceph/+bug/1346489 into the "main" branch from the "next" branch.

It also refreshes charm-helpers.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

I think this or an equiv was already been merged.

review: Approve

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