← Back to branch summary

~johannes.erdfelt/nova/vm-mode

~johannes.erdfelt/nova/vm-mode

Viewing all changes in revision 1173.

Committer: Johannes Erdfelt
Date: 2011-06-14 21:28:08 UTC
mfrom: (1162.2.19 nova)
Revision ID: johannes.erdfelt@rackspace.com-20110614212808-o07bn5fyik0t42pi

Merge with trunk

files added:
nova/api/openstack/create_instance_helper.py

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

nova/api/openstack/common.py

nova/api/openstack/limits.py

nova/api/openstack/servers.py

nova/api/openstack/views/servers.py

nova/api/openstack/wsgi.py

nova/api/openstack/zones.py

nova/compute/api.py

nova/exception.py

nova/scheduler/api.py

nova/scheduler/manager.py

nova/scheduler/zone_aware_scheduler.py

nova/tests/api/openstack/test_api.py

nova/tests/api/openstack/test_servers.py

nova/tests/scheduler/test_host_filter.py

nova/tests/scheduler/test_least_cost_scheduler.py

nova/tests/scheduler/test_scheduler.py

nova/tests/scheduler/test_zone_aware_scheduler.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

nova/api/openstack/__init__.py

nova/api/openstack/common.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/limits.py

nova/api/openstack/servers.py

nova/api/openstack/views/servers.py

nova/api/openstack/wsgi.py

nova/api/openstack/zones.py

nova/compute/api.py

nova/exception.py

nova/scheduler/api.py

nova/scheduler/manager.py

nova/scheduler/zone_aware_scheduler.py

nova/tests/api/openstack/test_api.py

nova/tests/api/openstack/test_servers.py

nova/tests/scheduler/test_host_filter.py

nova/tests/scheduler/test_least_cost_scheduler.py

nova/tests/scheduler/test_scheduler.py

nova/tests/scheduler/test_zone_aware_scheduler.py

tools/pip-requires

Older »