← Back to branch summary

~jason-koelker/nova/lp809909

~jason-koelker/nova/lp809909

Viewing all changes in revision 1298.

Committer: Jason Koelker
Date: 2011-07-27 22:02:49 UTC
mfrom: (1286.1.48 nova)
Revision ID: jason@koelker.net-20110727220249-xd3duuq32rhzxx3r

merge trunk

files modified:
nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py

nova/exception.py

nova/tests/test_compute.py

nova/tests/test_libvirt.py

nova/tests/test_quota.py

nova/tests/test_vmwareapi.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/db_fakes.py

nova/tests/vmwareapi/stubs.py

nova/virt/libvirt/connection.py

nova/virt/libvirt/netutils.py

nova/virt/vmwareapi/fake.py

nova/virt/vmwareapi/network_utils.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

Show diffs side-by-side

added added

removed removed

nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py

nova/exception.py

nova/tests/test_compute.py

nova/tests/test_libvirt.py

nova/tests/test_quota.py

nova/tests/test_vmwareapi.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/db_fakes.py

nova/tests/vmwareapi/stubs.py

nova/virt/libvirt/connection.py

nova/virt/libvirt/netutils.py

nova/virt/vmwareapi/fake.py

nova/virt/vmwareapi/network_utils.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

Older »