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

Branch merges

Propose for merging

No branches dependent on this one.

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

Mark Washenberger (community): Approve on 2011-06-14

Dan Prince (community): Approve on 2011-06-14

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

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

Vish Ishaya (community): Approve on 2011-06-10

Diff: 1505 lines (+671/-349)

14 files modified

nova/api/openstack/__init__.py (+32/-39)
nova/api/openstack/common.py (+0/-2)
nova/api/openstack/create_instance_helper.py (+346/-0)
nova/api/openstack/servers.py (+31/-262)
nova/api/openstack/views/servers.py (+8/-4)
nova/api/openstack/wsgi.py (+3/-3)
nova/api/openstack/zones.py (+66/-4)
nova/compute/api.py (+33/-8)
nova/scheduler/api.py (+6/-7)
nova/scheduler/manager.py (+2/-2)
nova/scheduler/zone_aware_scheduler.py (+4/-2)
nova/tests/api/openstack/test_servers.py (+138/-8)
nova/tests/scheduler/test_scheduler.py (+1/-7)
tools/pip-requires (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1123. By Sandy Walsh on 2011-06-14

removed extra init calls

1122. By Sandy Walsh on 2011-06-14

duplicate routes moved to base class

1121. By Sandy Walsh on 2011-06-14

version passing cleanup

1120. By Sandy Walsh on 2011-06-14

refactored out controller base class to use aggregation over inheritance

1119. By Sandy Walsh on 2011-06-13

removed yucky None return types

1118. By Sandy Walsh on 2011-06-13

trunk merge

1117. By Sandy Walsh on 2011-06-13

zones image_id/image_href support for 1.0/1.1

1116. By Sandy Walsh on 2011-06-10

fixed reraise in trap_error

1115. By Sandy Walsh on 2011-06-09

forgot some debugging statements

1114. By Sandy Walsh on 2011-06-09

trunk merge and ec2 tests fixed