lp://staging/~cerberus/nova/disk_config

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/~hudson-openstack/nova/trunk

Brian Waldon (community): Needs Fixing on 2011-09-20

Vish Ishaya (community): Approve on 2011-09-11

Diff: 466 lines (+362/-5)

8 files modified

nova/api/openstack/contrib/diskconfig.py (+150/-0)
nova/db/sqlalchemy/migrate_repo/versions/050_add_disk_config_to_instances.py (+39/-0)
nova/db/sqlalchemy/models.py (+1/-0)
nova/tests/api/openstack/contrib/test_diskconfig.py (+156/-0)
nova/tests/api/openstack/test_extensions.py (+1/-0)
nova/virt/xenapi/vm_utils.py (+4/-2)
nova/virt/xenapi/vmops.py (+5/-1)
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance (+6/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1528. By Matt Dietz on 2011-09-23

Updates for merge prop comments

1527. By Matt Dietz on 2011-09-23

Merge from trunk and update migration number again

1526. By Matt Dietz on 2011-09-21

Merge from trunk, updated failing tests and pep8

1525. By Matt Dietz on 2011-09-19

Merge from trunk and migration renumbering

1524. By Matt Dietz on 2011-09-12

Made the migration less silly

1523. By Matt Dietz on 2011-09-12

Changed the output format to look more like the rest of the API commands

1522. By Matt Dietz on 2011-09-10

All tests passing, and PEP8 fixes

1521. By Matt Dietz on 2011-09-10

Fixes for unit tests

1520. By Matt Dietz on 2011-09-10

Updates to the plugin to actually have it apply the metadata

1519. By Matt Dietz on 2011-09-09

Merge from trunk