Merge lp://staging/~hopem/charms/precise/ceph-osd/lp1259919 into lp://staging/~charmers/charms/precise/ceph-osd/trunk
Proposed by
Edward Hope-Morley
| Status: | Merged |
|---|---|
| Merged at revision: | 17 |
| Proposed branch: | lp://staging/~hopem/charms/precise/ceph-osd/lp1259919 |
| Merge into: | lp://staging/~charmers/charms/precise/ceph-osd/trunk |
| Diff against target: |
53 lines (+15/-3) 4 files modified
config.yaml (+11/-0) hooks/hooks.py (+2/-1) revision (+1/-1) templates/ceph.conf (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~hopem/charms/precise/ceph-osd/lp1259919 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| James Page (james-page) | # |
review:
Approve
Revision history for this message
| James Page (james-page) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
