Merge lp://staging/~billy-olsen/charms/trusty/neutron-api/backport-lp1398182 into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Proposed by
Billy Olsen
Status: | Merged |
---|---|
Merged at revision: | 114 |
Proposed branch: | lp://staging/~billy-olsen/charms/trusty/neutron-api/backport-lp1398182 |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk |
Diff against target: |
309 lines (+123/-51) 4 files modified
config.yaml (+12/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+25/-0) hooks/charmhelpers/contrib/openstack/ip.py (+49/-44) unit_tests/test_neutron_api_hooks.py (+37/-7) |
To merge this branch: | bzr merge lp://staging/~billy-olsen/charms/trusty/neutron-api/backport-lp1398182 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Corey Bryant | Approve | ||
charmers | Pending | ||
Review via email: mp+262005@code.staging.launchpad.net |
To post a comment you must log in.
charm_lint_check #5408 neutron-api for billy-olsen mp262005
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/5408/