Merge lp:~hopem/charms/precise/ceph-osd/lp1273067 into lp:~openstack-charmers-archive/charms/precise/ceph-osd/trunk
Proposed by
Edward Hope-Morley
Status: | Merged |
---|---|
Merged at revision: | 18 |
Proposed branch: | lp:~hopem/charms/precise/ceph-osd/lp1273067 |
Merge into: | lp:~openstack-charmers-archive/charms/precise/ceph-osd/trunk |
Diff against target: |
270 lines (+127/-9) 9 files modified
config.yaml (+5/-0) hooks/charmhelpers/contrib/storage/linux/utils.py (+2/-1) hooks/charmhelpers/core/hookenv.py (+6/-0) hooks/charmhelpers/core/host.py (+53/-3) hooks/charmhelpers/fetch/__init__.py (+40/-3) hooks/charmhelpers/fetch/archiveurl.py (+15/-0) hooks/hooks.py (+2/-1) revision (+1/-1) templates/ceph.conf (+3/-0) |
To merge this branch: | bzr merge lp:~hopem/charms/precise/ceph-osd/lp1273067 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+212715@code.launchpad.net |
Description of the change
The is part of a resubmit for all the charm use-syslog patches since the previous attempts were getting messy
To post a comment you must log in.