Merge lp:~heut2008/charms/trusty/ceph-radosgw/auth_protocol into lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/trunk
Proposed by
Yaguang Tang
Status: | Superseded |
---|---|
Proposed branch: | lp:~heut2008/charms/trusty/ceph-radosgw/auth_protocol |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/ceph-radosgw/trunk |
Diff against target: |
392 lines (+169/-46) (has conflicts) 8 files modified
hooks/ceph.py (+0/-15) hooks/charmhelpers/contrib/storage/linux/utils.py (+1/-0) hooks/charmhelpers/core/fstab.py (+116/-0) hooks/charmhelpers/core/hookenv.py (+5/-4) hooks/charmhelpers/core/host.py (+8/-6) hooks/charmhelpers/fetch/__init__.py (+33/-16) hooks/hooks.py (+5/-4) templates/ceph.conf (+1/-1) Conflict adding file hooks/charmhelpers/core/fstab.py. Moved existing file to hooks/charmhelpers/core/fstab.py.moved. |
To merge this branch: | bzr merge lp:~heut2008/charms/trusty/ceph-radosgw/auth_protocol |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email: mp+232538@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-08-28.
To post a comment you must log in.