← Back to branch summary

~hudson-openstack/nova/trunk

~hudson-openstack/nova/trunk

Viewing all changes in revision 1245.3.27.

Committer: Ryu Ishimoto
Date: 2011-07-21 06:38:13 UTC
mfrom: (1293 nova)
mto: (1245.6.6 nova)
mto: This revision was merged to the branch mainline in revision 1321.
Revision ID: ryu@midokura.jp-20110721063813-3223p6t22g9fga4d

Merged trunk

files added:
nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py

files modified:
Authors

bin/nova-dhcpbridge

bin/nova-manage

nova/api/openstack/consoles.py

nova/api/openstack/contrib/multinic.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/faults.py

nova/api/openstack/servers.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/network/api.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/__init__.py

nova/tests/api/openstack/test_faults.py

nova/tests/test_libvirt.py

nova/tests/test_network.py

nova/virt/libvirt/vif.py

nova/virt/xenapi/vmops.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/agent

Show diffs side-by-side

added added

removed removed

bin/nova-dhcpbridge

bin/nova-manage

nova/api/openstack/consoles.py

nova/api/openstack/contrib/multinic.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/faults.py

nova/api/openstack/servers.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/network/api.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/__init__.py

nova/tests/api/openstack/test_faults.py

nova/tests/test_libvirt.py

nova/tests/test_network.py

nova/virt/libvirt/vif.py

nova/virt/xenapi/vmops.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/agent

Older »