lp:~cerberus/nova/xs_resize

Branch merges

Propose for merging

No branches dependent on this one.

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

Rick Harris (community): Approve on 2011-03-23

Sandy Walsh (community): Approve on 2011-03-23

Diff: 682 lines (+277/-67)

14 files modified

nova/api/openstack/servers.py (+1/-0)
nova/api/openstack/views/servers.py (+8/-0)
nova/compute/api.py (+39/-3)
nova/compute/manager.py (+52/-21)
nova/db/sqlalchemy/api.py (+4/-4)
nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py (+50/-0)
nova/db/sqlalchemy/models.py (+2/-0)
nova/tests/api/openstack/test_servers.py (+12/-10)
nova/tests/test_compute.py (+55/-4)
nova/tests/test_localization.py (+4/-3)
nova/tests/xenapi/stubs.py (+5/-2)
nova/virt/xenapi/vmops.py (+38/-12)
nova/virt/xenapi_conn.py (+5/-7)
plugins/xenserver/xenapi/etc/xapi.d/plugins/migration (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

826. By Matt Dietz on 2011-03-23

merge prop fixes

825. By Matt Dietz on 2011-03-23

Forgot extraneous module import again

824. By Matt Dietz on 2011-03-23

Forgot extraneous module import

823. By Matt Dietz on 2011-03-23

Unit test cleanup

822. By Matt Dietz on 2011-03-23

Moving the migration yet again

821. By Matt Dietz on 2011-03-23

Merge from trunk

820. By Matt Dietz on 2011-03-23

merge prop changes

819. By Matt Dietz on 2011-03-22

Tweak

818. By Matt Dietz on 2011-03-22

tweak

817. By Matt Dietz on 2011-03-22

tweak