Merge lp://staging/~corey.bryant/charms/trusty/neutron-gateway/fix-global-reqs into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Approved by: | Billy Olsen |
Approved revision: | 119 |
Merged at revision: | 119 |
Proposed branch: | lp://staging/~corey.bryant/charms/trusty/neutron-gateway/fix-global-reqs |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/neutron-gateway/next |
Diff against target: |
1304 lines (+564/-94) 13 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+24/-5) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) hooks/charmhelpers/contrib/openstack/context.py (+1/-1) hooks/charmhelpers/contrib/openstack/ip.py (+49/-44) hooks/charmhelpers/contrib/openstack/neutron.py (+6/-4) hooks/charmhelpers/contrib/openstack/utils.py (+21/-8) hooks/charmhelpers/core/hookenv.py (+62/-1) hooks/charmhelpers/core/host.py (+24/-6) hooks/charmhelpers/core/services/base.py (+30/-9) tests/charmhelpers/contrib/amulet/utils.py (+91/-6) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+6/-2) tests/charmhelpers/contrib/openstack/amulet/utils.py (+122/-3) |
To merge this branch: | bzr merge lp://staging/~corey.bryant/charms/trusty/neutron-gateway/fix-global-reqs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Billy Olsen | Approve | ||
Review via email: mp+262478@code.staging.launchpad.net |
Description of the change
See https:/
for details explaining this merge.
To post a comment you must log in.
charm_lint_check #5479 neutron- gateway- next for corey.bryant mp262478
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/5479/