← Back to branch summary

~corywright/nova/xs-vm-instance-params

~corywright/nova/xs-vm-instance-params

Viewing all changes in revision 766.

Committer: Cory Wright
Date: 2011-03-10 15:48:47 UTC
mfrom: (750.1.34 nova)
Revision ID: cory.wright@rackspace.com-20110310154847-3hn2m3h25rz17r6r

merge trunk

files added:
nova/scheduler/api.py

nova/scheduler/zone_manager.py

nova/tests/test_zones.py

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

nova/api/openstack/zones.py

nova/flags.py

nova/image/s3.py

nova/network/linux_net.py

nova/objectstore/image.py

nova/scheduler/manager.py

nova/tests/api/openstack/test_zones.py

nova/virt/disk.py

nova/virt/libvirt_conn.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

nova/api/openstack/__init__.py

nova/api/openstack/zones.py

nova/image/s3.py

nova/network/linux_net.py

nova/objectstore/image.py

nova/scheduler/api.py

nova/scheduler/manager.py

nova/scheduler/zone_manager.py

nova/tests/api/openstack/test_zones.py

nova/tests/test_zones.py

nova/virt/disk.py

nova/virt/libvirt_conn.py

tools/pip-requires

Older »