← Back to branch summary

~termie/nova/db_migration

~termie/nova/db_migration

Viewing all changes in revision 496.1.2.

Committer: termie
Date: 2010-12-28 21:43:35 UTC
mfrom: (498 nova)
mto: This revision was merged to the branch mainline in revision 506.
Revision ID: code@term.ie-20101228214335-4mixvvansq6ntcsr

merge from upstream and fix conflicts

files modified:
nova/api/openstack/__init__.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/compute/power_state.py

nova/tests/api/openstack/test_servers.py

nova/tests/test_compute.py

nova/virt/fake.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

run_tests.sh

Show diffs side-by-side

added added

removed removed

nova/api/openstack/__init__.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/compute/power_state.py

nova/tests/api/openstack/test_servers.py

nova/tests/test_compute.py

nova/virt/fake.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

Older »