Merge lp:~vishvananda/nova/fix-dhcpbridge into lp:~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
Status: | Merged |
---|---|
Approved by: | Vish Ishaya |
Approved revision: | 237 |
Merged at revision: | 241 |
Proposed branch: | lp:~vishvananda/nova/fix-dhcpbridge |
Merge into: | lp:~hudson-openstack/nova/trunk |
Prerequisite: | lp:~vishvananda/nova/fix-hostname |
Diff against target: |
252 lines (+47/-36) 5 files modified
bin/nova-dhcpbridge (+1/-1) nova/endpoint/cloud.py (+3/-3) nova/network/linux_net.py (+2/-6) nova/network/model.py (+37/-22) nova/network/service.py (+4/-4) |
To merge this branch: | bzr merge lp:~vishvananda/nova/fix-dhcpbridge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Jesse Andrews (community) | Approve | ||
Review via email: mp+32518@code.launchpad.net |
Commit message
Fixes issues with allocation and deallocation of fixed and elastic addresses.
Description of the change
Fixes issues with allocation and deallocation of fixed and elastic addresses.
I ended up merging in fix-hostname while i was testing, so I'm resubmitting this branch with that one as a prereq.
To post a comment you must log in.
lgtm