← Back to branch summary

~citrix-openstack/nova/xenapi-netinject-prop

~citrix-openstack/nova/xenapi-netinject-prop

Viewing all changes in revision 697.

Committer: Salvatore Orlando
Date: 2011-03-08 22:33:28 UTC
mfrom: (669.1.97 nova)
Revision ID: salvatore.orlando@eu.citrix.com-20110308223328-b44thi2r5psq08fc

merge trunk

now using refactored _get_vm_opaqueref

files added:
nova/db/sqlalchemy/migrate_repo/versions/009_add_instance_migrations.py

nova/tests/api/openstack/common.py

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

files renamed:
etc/nova-api.conf => etc/api-paste.ini

files modified:
bin/nova-api

nova/api/ec2/__init__.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/log.py

nova/rpc.py

nova/tests/api/openstack/test_servers.py

nova/tests/test_compute.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/virt/fake.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

Show diffs side-by-side

added added

removed removed

nova/api/ec2/__init__.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/009_add_instance_migrations.py

nova/db/sqlalchemy/migration.py

nova/db/sqlalchemy/models.py

nova/tests/api/openstack/common.py

nova/tests/api/openstack/test_servers.py

nova/tests/test_compute.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/virt/fake.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

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

Older »