lp:~sandy-walsh/nova/dist-sched-3

Branch merges

Propose for merging

No branches dependent on this one.

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

Rick Harris (community): Approve on 2011-06-08

Matt Dietz (community): Approve on 2011-06-08

Jay Pipes: Pending requested 2011-06-08

Diff: 780 lines (+448/-103)

10 files modified

nova/api/openstack/__init__.py (+1/-1)
nova/api/openstack/servers.py (+3/-1)
nova/api/openstack/zones.py (+12/-16)
nova/compute/api.py (+136/-56)
nova/flags.py (+2/-0)
nova/scheduler/api.py (+1/-1)
nova/scheduler/manager.py (+11/-1)
nova/scheduler/zone_aware_scheduler.py (+132/-25)
nova/tests/api/openstack/test_zones.py (+5/-1)
nova/tests/scheduler/test_zone_aware_scheduler.py (+145/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1101. By Sandy Walsh on 2011-06-08

removed straggler code

1100. By Sandy Walsh on 2011-06-08

trunk merge

1099. By Sandy Walsh on 2011-06-07

sanity check

1098. By Sandy Walsh on 2011-06-07

fixed up tests after trunk merge

1097. By Sandy Walsh on 2011-06-03

trunk merge after 2b hit

1096. By Sandy Walsh on 2011-05-26

branch 2a merge (including trunk)

1095. By Sandy Walsh on 2011-05-26

remerged with 2a

1094. By Sandy Walsh on 2011-05-26

tests pass and pep8'ed

1093. By Sandy Walsh on 2011-05-26

refactoring compute.api.create()

1092. By Sandy Walsh on 2011-05-25

starting breakdown of nova.compute.api.create()