Merge lp://qastaging/~corey.bryant/charms/trusty/cinder/sync-ch into lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next
Proposed by
Corey Bryant
| Status: | Merged |
|---|---|
| Merged at revision: | 106 |
| Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/cinder/sync-ch |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/cinder/next |
| Diff against target: |
740 lines (+370/-99) 12 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+36/-3) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+240/-49) hooks/charmhelpers/contrib/openstack/context.py (+8/-7) hooks/charmhelpers/contrib/openstack/templates/ceph.conf (+6/-6) hooks/charmhelpers/contrib/openstack/utils.py (+9/-5) hooks/charmhelpers/contrib/storage/linux/ceph.py (+6/-6) hooks/charmhelpers/core/hookenv.py (+1/-0) hooks/charmhelpers/core/host.py (+31/-5) hooks/charmhelpers/core/services/helpers.py (+2/-2) hooks/charmhelpers/fetch/__init__.py (+23/-14) hooks/charmhelpers/fetch/archiveurl.py (+7/-1) hooks/charmhelpers/fetch/giturl.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/cinder/sync-ch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenStack Charmers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Revision history for this message
| uosci-testing-bot (uosci-testing-bot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_lint_check #6284 cinder-next for corey.bryant mp265046
LINT OK: passed
Build: http://