Merge lp://staging/~gnuoy/charms/trusty/ceph-osd/stable-charmhelper-sync into lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/trunk
Proposed by
Liam Young
| Status: | Merged |
|---|---|
| Merged at revision: | 23 |
| Proposed branch: | lp://staging/~gnuoy/charms/trusty/ceph-osd/stable-charmhelper-sync |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/trunk |
| Diff against target: |
213 lines (+35/-37) 8 files modified
.bzrignore (+1/-0) Makefile (+8/-2) hooks/ceph.py (+4/-18) hooks/charmhelpers/contrib/storage/linux/utils.py (+4/-0) hooks/charmhelpers/core/host.py (+2/-6) hooks/charmhelpers/fetch/__init__.py (+11/-7) hooks/hooks.py (+4/-3) templates/ceph.conf (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~gnuoy/charms/trusty/ceph-osd/stable-charmhelper-sync |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| David Britton (community) | Approve | ||
| Chris Glass (community) | Approve | ||
|
Review via email:
|
|||
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
Looks good! +1 (would merge)