lp://qastaging/~sandy-walsh/nova/zones

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Eric Day (community): Approve on 2011-02-16

Jay Pipes (community): Needs Fixing on 2011-02-15

Diff: 487 lines (+374/-9)

11 files modified

nova/api/openstack/__init__.py (+4/-0)
nova/api/openstack/auth.py (+1/-0)
nova/api/openstack/servers.py (+0/-2)
nova/api/openstack/zones.py (+80/-0)
nova/auth/novarc.template (+3/-4)
nova/db/api.py (+28/-0)
nova/db/sqlalchemy/api.py (+44/-0)
nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py (+61/-0)
nova/db/sqlalchemy/migration.py (+2/-2)
nova/db/sqlalchemy/models.py (+10/-1)
nova/tests/api/openstack/test_zones.py (+141/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

651. By Sandy Walsh on 2011-02-17

copyright notice

650. By Sandy Walsh on 2011-02-17

changed from 003-004 migration

649. By Sandy Walsh on 2011-02-15

fixed / renamed migration scripts

648. By Sandy Walsh on 2011-02-15

trunk merge

647. By Sandy Walsh on 2011-02-15

better filtering

646. By Sandy Walsh on 2011-02-15

fixed nova-combined debug hack and renamed ChildZone to Zone

645. By Sandy Walsh on 2011-02-14

removed debugging

644. By Sandy Walsh on 2011-02-14

fixed template and added migration

643. By Sandy Walsh on 2011-02-14

better filtering

642. By Sandy Walsh on 2011-02-11

zone api tests passing