lp:~rconradharris/nova/uuid-redux

Branch merges

Propose for merging

No branches dependent on this one.

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

Ed Leafe (community): Abstain on 2011-06-18

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

Brian Lamar (community): Needs Information on 2011-06-16

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

Diff: 671 lines (+317/-77)

13 files modified

nova/api/openstack/ips.py (+11/-12)
nova/api/openstack/views/servers.py (+2/-1)
nova/compute/api.py (+9/-2)
nova/compute/manager.py (+0/-1)
nova/db/api.py (+5/-0)
nova/db/sqlalchemy/api.py (+38/-27)
nova/db/sqlalchemy/migrate_repo/versions/025_add_uuid_to_instances.py (+43/-0)
nova/db/sqlalchemy/models.py (+1/-0)
nova/scheduler/api.py (+78/-25)
nova/tests/api/openstack/test_servers.py (+67/-7)
nova/tests/scheduler/test_scheduler.py (+30/-2)
nova/tests/test_utils.py (+18/-0)
nova/utils.py (+15/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1205. By Rick Harris on 2011-06-20

Moving add_uuid migration to 025

1204. By Rick Harris on 2011-06-20

Merging trunk, fixing conflicts

1203. By Rick Harris on 2011-06-18

Adding tests for is_uuid_like

1202. By Rick Harris on 2011-06-17

Using proper UUID format for uuids

1201. By Rick Harris on 2011-06-17

Merging trunk

1200. By Rick Harris on 2011-06-17

Fixed migration per review feedback.

1199. By Rick Harris on 2011-06-16

Renaming to _build_instance_get

1198. By Rick Harris on 2011-06-16

PEP8 cleanup.

1197. By Rick Harris on 2011-06-16

Fixing another test

1196. By Rick Harris on 2011-06-16

Fixing test_servers_by_uuid