lp:~zulcss/nova/nova-convert-ipy-to-netaddr

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1211

Brian Waldon (community): Approve on 2011-06-23

Chuck Short (community): Needs Resubmitting on 2011-06-23

Soren Hansen (community): Approve on 2011-06-14

Devin Carlen (community): Approve on 2011-06-07

Dan Prince (community): Needs Fixing on 2011-06-06

Diff: 346 lines (+46/-48)

11 files modified

bin/nova-manage (+3/-3)
nova/api/ec2/cloud.py (+2/-2)
nova/network/linux_net.py (+2/-2)
nova/network/manager.py (+23/-23)
nova/tests/network/base.py (+1/-1)
nova/tests/test_flat_network.py (+3/-3)
nova/tests/test_network.py (+1/-1)
nova/tests/test_vlan_network.py (+3/-3)
nova/virt/libvirt/connection.py (+1/-2)
nova/virt/libvirt/netutils.py (+7/-7)
tools/pip-requires (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #793705: Duplicate functionality in python-ipy and python-netaddr

Wishlist

Fix Released

Link a bug report

Related blueprints

1169. By Chuck Short on 2011-06-23

Fixed typo

1168. By Chuck Short on 2011-06-23

Merge trunk:

1167. By Chuck Short on 2011-06-13

Merge trunk

1166. By Chuck Short on 2011-06-09

Merged trunk

1165. By Chuck Short on 2011-06-09

Fix merge conflict

1164. By Chuck Short on 2011-06-07

Use IPNetwork rather than IPRange

1163. By Chuck Short on 2011-06-06

Remove more stray import IPy

1162. By Chuck Short on 2011-06-06

Dropped requirement for IPy

1161. By Chuck Short on 2011-06-06

Convert stray import IPy

1160. By Chuck Short on 2011-06-06

Remove ipy from virt code and replace with netaddr