← Back to branch summary

~rackspace-ozone/nova/osapi_integration_tests

~rackspace-ozone/nova/osapi_integration_tests

Viewing all changes in revision 850.

Committer: Kevin L. Mitchell
Date: 2011-03-23 14:58:17 UTC
mfrom: (843.2.9 nova)
Revision ID: kevin.mitchell@rackspace.com-20110323145817-00sjjku44viudofo

Merge from trunk

files added:
nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py

nova/tests/integrated/integrated_helpers.py

nova/tests/integrated/test_login.py

nova/tests/network

nova/tests/network/__init__.py

nova/tests/network/base.py

nova/tests/test_flat_network.py

nova/tests/test_vlan_network.py

files modified:
doc/source/_static/tweaks.css

doc/source/_theme/layout.html

nova/api/ec2/admin.py

nova/db/sqlalchemy/models.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/integrated/api/client.py

nova/tests/test_network.py

nova/virt/interfaces.template

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/xenapi/vmops.py

Show diffs side-by-side

added added

removed removed

doc/source/_static/tweaks.css

doc/source/_theme/layout.html

nova/api/ec2/admin.py

nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py

nova/db/sqlalchemy/models.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/integrated/api/client.py

nova/tests/integrated/integrated_helpers.py

nova/tests/integrated/test_login.py

nova/tests/network/

nova/tests/network/__init__.py

nova/tests/network/base.py

nova/tests/test_flat_network.py

nova/tests/test_network.py

nova/tests/test_vlan_network.py

nova/virt/interfaces.template

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/xenapi/vmops.py

Older »