lp:~rconradharris/nova/server_progress

Branch merges

Propose for merging

No branches dependent on this one.

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

Trey Morris (community): Approve on 2011-09-20

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

Diff: 1033 lines (+322/-110)

22 files modified

nova/api/openstack/views/servers.py (+5/-5)
nova/compute/api.py (+6/-3)
nova/compute/manager.py (+9/-6)
nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py (+43/-0)
nova/db/sqlalchemy/models.py (+2/-0)
nova/flags.py (+4/-0)
nova/tests/api/openstack/contrib/test_createserverext.py (+4/-2)
nova/tests/api/openstack/contrib/test_volumes.py (+2/-1)
nova/tests/api/openstack/test_server_actions.py (+1/-0)
nova/tests/api/openstack/test_servers.py (+10/-5)
nova/tests/test_compute.py (+1/-1)
nova/tests/test_virt_drivers.py (+2/-1)
nova/tests/test_xenapi.py (+45/-31)
nova/tests/xenapi/stubs.py (+5/-2)
nova/utils.py (+14/-0)
nova/virt/driver.py (+10/-6)
nova/virt/fake.py (+3/-3)
nova/virt/xenapi/vm_utils.py (+4/-0)
nova/virt/xenapi/vmops.py (+126/-30)
nova/virt/xenapi_conn.py (+14/-9)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+5/-1)
plugins/xenserver/xenapi/etc/xapi.d/plugins/migration (+7/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1575. By Rick Harris on 2011-09-21

Renumbering instance progress migration

1574. By Rick Harris on 2011-09-21

Fixing tests

1573. By Rick Harris on 2011-09-19

Merging trunk

1572. By Rick Harris on 2011-09-19

Renaming progress migration to 47

1571. By Rick Harris on 2011-09-16

Fixing list prepend

1570. By Rick Harris on 2011-09-16

Merging trunk

1569. By Rick Harris on 2011-09-16

Pep8 Fix

1568. By Rick Harris on 2011-09-16

Zero out the progress when beginning a resize

1567. By Rick Harris on 2011-09-16

Adding migration progress

1566. By Rick Harris on 2011-09-16

Fixing tests, PEP8 failures