lp:~rconradharris/nova/dist-sched-2b

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~hudson-openstack/nova/trunk at revision 1145

Brian Waldon (community): Approve on 2011-06-03

Ed Leafe (community): Needs Fixing on 2011-06-02

Sandy Walsh (community): Approve on 2011-06-01

Diff: 1123 lines (+577/-215)

10 files modified

nova/exception.py (+9/-0)
nova/scheduler/host_filter.py (+1/-0)
nova/scheduler/least_cost.py (+156/-0)
nova/scheduler/zone_aware_scheduler.py (+13/-6)
nova/test.py (+15/-3)
nova/tests/scheduler/test_host_filter.py (+206/-0)
nova/tests/scheduler/test_least_cost_scheduler.py (+144/-0)
nova/tests/scheduler/test_scheduler.py (+2/-1)
nova/tests/scheduler/test_zone_aware_scheduler.py (+31/-0)
nova/tests/test_host_filter.py (+0/-205)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1083. By Rick Harris on 2011-06-02

Fixing conflicts

1082. By Rick Harris on 2011-06-01

Fixing a bunch of conflicts

1081. By Rick Harris on 2011-05-31

Fixing Scheduler Tests

1080. By Rick Harris on 2011-05-31

Resolving conflict and finish test_images

1079. By Rick Harris on 2011-05-17

Small cleanups

1078. By Rick Harris on 2011-05-17

Moving into scheduler subdir and refactoring out common code

1077. By Rick Harris on 2011-05-17

Moving tests into scheduler subdirectory

1076. By Rick Harris on 2011-05-17

Pep8 fixes

1075. By Rick Harris on 2011-05-17

Using import_class to import filter_host driver

1074. By Rick Harris on 2011-05-17

Adding fill first cost function