lp:~ntt-pf-lab/nova/flatmanager-ipv6

Branch merges

Propose for merging

No branches dependent on this one.

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

Rick Clark (community): Approve on 2011-03-23

Josh Kearney (community): Approve on 2011-03-21

Soren Hansen: Pending requested 2011-03-14

Diff: 1445 lines (+836/-411)

13 files modified

nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py (+154/-0)
nova/db/sqlalchemy/models.py (+2/-5)
nova/network/linux_net.py (+1/-1)
nova/network/manager.py (+8/-2)
nova/tests/network/__init__.py (+67/-0)
nova/tests/network/base.py (+154/-0)
nova/tests/test_flat_network.py (+161/-0)
nova/tests/test_network.py (+0/-371)
nova/tests/test_vlan_network.py (+242/-0)
nova/virt/interfaces.template (+11/-5)
nova/virt/libvirt.xml.template (+2/-2)
nova/virt/libvirt_conn.py (+30/-22)
nova/virt/xenapi/vmops.py (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

760. By Koji Iida on 2011-03-23

Fix to avoid db migration failure in virtualenv

759. By Tushar Patil on 2011-03-19

Changed Copyright to NTT for newly added files for flatmanager ipv6

758. By Tushar Patil on 2011-03-16

converted new lines from CRLF to LF

757. By Koji Iida on 2011-03-16

Fix instance creation fail under use_ipv6=false and FlatManager

756. By Koji Iida on 2011-03-16

pep8 clean

755. By Koji Iida on 2011-03-16

Updating gateway_v6 in _on_set_network_host() is not required for FlatManager

754. By Tushar Patil on 2011-03-14

Merged test_network.py properly. Before I had deleted this file and added again, but this file status should be modified when you see the merged difference

753. By Tushar Patil on 2011-03-14

removed conflicts and merged with trunk

752. By Tushar Patil on 2011-03-14

Reverted unmodified files

751. By Tushar Patil on 2011-03-14

Reverted unmodified files