Merge lp://qastaging/~hopem/charms/precise/ceph/lp1259919 into lp://qastaging/~charmers/charms/precise/ceph/trunk
Proposed by
Edward Hope-Morley
Status: | Merged |
---|---|
Merged at revision: | 68 |
Proposed branch: | lp://qastaging/~hopem/charms/precise/ceph/lp1259919 |
Merge into: | lp://qastaging/~charmers/charms/precise/ceph/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://qastaging/~hopem/charms/precise/ceph/lp1259919 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+198705@code.qastaging.launchpad.net |
To post a comment you must log in.