← Back to branch summary

~rconradharris/nova/dist-sched-2b

~rconradharris/nova/dist-sched-2b

Viewing all changes in revision 1082.

Committer: Rick Harris
Date: 2011-06-01 00:54:33 UTC
mfrom: (1063.1.64 nova)
Revision ID: rick.harris@rackspace.com-20110601005433-k1qqb8d0py9lhjo0

Fixing a bunch of conflicts

files modified:
nova/compute/api.py

nova/exception.py

nova/scheduler/host_filter.py

nova/scheduler/zone_aware_scheduler.py

nova/tests/scheduler/test_host_filter.py

Show diffs side-by-side

added added

removed removed

nova/compute/api.py

nova/exception.py

nova/scheduler/host_filter.py

nova/scheduler/zone_aware_scheduler.py

nova/tests/scheduler/test_host_filter.py

Older »