← Back to branch summary

~rackspace-titan/nova/openstack-api-markers

~rackspace-titan/nova/openstack-api-markers

Viewing all changes in revision 807.

Committer: Naveed Massjouni
Date: 2011-03-17 21:31:50 UTC
mfrom: (784.1.38 nova)
Revision ID: naveedm9@gmail.com-20110317213150-lnquz4i6v0otfe47

Merge from trunk.

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

nova/db/sqlalchemy/api.py

nova/tests/db/fakes.py

nova/tests/test_utils.py

nova/tests/test_xenapi.py

nova/utils.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

Show diffs side-by-side

added added

removed removed

nova/api/openstack/servers.py

nova/db/sqlalchemy/api.py

nova/tests/db/fakes.py

nova/tests/test_utils.py

nova/tests/test_xenapi.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

Older »