Merge lp://staging/~hopem/charms/trusty/neutron-api/lp1499643 into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Proposed by
Edward Hope-Morley
| Status: | Merged |
|---|---|
| Merged at revision: | 145 |
| Proposed branch: | lp://staging/~hopem/charms/trusty/neutron-api/lp1499643 |
| Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
| Diff against target: |
2287 lines (+1616/-92) 15 files modified
hooks/charmhelpers/contrib/network/ip.py (+5/-3) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0) hooks/charmhelpers/contrib/openstack/context.py (+60/-16) hooks/charmhelpers/contrib/openstack/templating.py (+30/-2) hooks/charmhelpers/contrib/openstack/utils.py (+232/-2) hooks/charmhelpers/contrib/storage/linux/ceph.py (+226/-13) hooks/charmhelpers/core/hookenv.py (+32/-0) hooks/charmhelpers/core/host.py (+32/-16) hooks/charmhelpers/core/hugepage.py (+8/-1) hooks/charmhelpers/core/strutils.py (+30/-0) tests/charmhelpers/contrib/amulet/deployment.py (+4/-2) tests/charmhelpers/contrib/amulet/utils.py (+193/-19) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+23/-9) tests/charmhelpers/contrib/openstack/amulet/utils.py (+359/-0) |
| To merge this branch: | bzr merge lp://staging/~hopem/charms/trusty/neutron-api/lp1499643 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
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 | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
charm_unit_test #9941 neutron-api-next for hopem mp272410
UNIT OK: passed
Build: http://