lp:~sandy-walsh/nova/zone-add-uses-zone-name

Branch merges

Propose for merging

No branches dependent on this one.

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

Matt Dietz (community): Approve on 2011-09-21

Jason Kölker (community): Approve on 2011-09-16

Diff: 800 lines (+193/-72)

12 files modified

nova/api/openstack/servers.py (+41/-0)
nova/api/openstack/zones.py (+1/-1)
nova/compute/api.py (+2/-4)
nova/db/sqlalchemy/migrate_repo/versions/048_add_zone_name.py (+35/-0)
nova/db/sqlalchemy/models.py (+1/-0)
nova/rpc/impl_kombu.py (+0/-1)
nova/scheduler/abstract_scheduler.py (+2/-1)
nova/scheduler/api.py (+37/-21)
nova/scheduler/zone_manager.py (+12/-5)
nova/tests/scheduler/test_scheduler.py (+43/-27)
nova/tests/test_zones.py (+18/-11)
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

1534. By Sandy Walsh on 2011-09-21

trunk merge fixup

1533. By Sandy Walsh on 2011-09-21

fix diverged branch

1532. By Sandy Walsh on 2011-09-21

migration conflict fixed

1531. By Sandy Walsh on 2011-09-21

clean up based on cerberus review

1530. By Sandy Walsh on 2011-09-21

clean up based on cerberus review

1529. By Sandy Walsh on 2011-09-16

cleaned up

1528. By Sandy Walsh on 2011-09-16

remove debugging

1527. By Sandy Walsh on 2011-09-15

trunk merge

1526. By Sandy Walsh on 2011-09-15

tests working again

1525. By Sandy Walsh on 2011-09-15

exceptions properly passed around now