Merge lp://qastaging/~cbehrens/nova/milestone-proposed.lp855115 into lp://qastaging/~hudson-openstack/nova/milestone-proposed
Proposed by
Chris Behrens
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Thierry Carrez | ||||
| Approved revision: | 1545 | ||||
| Merged at revision: | 1200 | ||||
| Proposed branch: | lp://qastaging/~cbehrens/nova/milestone-proposed.lp855115 | ||||
| Merge into: | lp://qastaging/~hudson-openstack/nova/milestone-proposed | ||||
| Diff against target: |
174 lines (+68/-12) 5 files modified
nova/api/ec2/__init__.py (+4/-0) nova/api/openstack/contrib/floating_ips.py (+6/-1) nova/db/sqlalchemy/api.py (+11/-10) nova/tests/api/openstack/contrib/test_floating_ips.py (+1/-1) nova/tests/test_network.py (+46/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~cbehrens/nova/milestone-proposed.lp855115 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Thierry Carrez | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix lp:855115 -- Issue with disassociating floating ips.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
In trunk now