lp:~rackspace-titan/nova/minidom-to-etree

Branch merges

Propose for merging

No branches dependent on this one.

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

Dan Prince (community): Approve on 2011-09-13

Rick Harris (community): Approve on 2011-09-06

Diff: 3701 lines (+1453/-1340)

29 files modified

nova/api/openstack/common.py (+31/-35)
nova/api/openstack/flavors.py (+33/-36)
nova/api/openstack/images.py (+56/-77)
nova/api/openstack/ips.py (+28/-33)
nova/api/openstack/limits.py (+38/-40)
nova/api/openstack/schemas/v1.1/addresses.rng (+14/-0)
nova/api/openstack/schemas/v1.1/flavor.rng (+10/-0)
nova/api/openstack/schemas/v1.1/flavors.rng (+6/-0)
nova/api/openstack/schemas/v1.1/flavors_index.rng (+12/-0)
nova/api/openstack/schemas/v1.1/image.rng (+30/-0)
nova/api/openstack/schemas/v1.1/images.rng (+6/-0)
nova/api/openstack/schemas/v1.1/images_index.rng (+12/-0)
nova/api/openstack/schemas/v1.1/limits.rng (+28/-0)
nova/api/openstack/schemas/v1.1/metadata.rng (+9/-0)
nova/api/openstack/schemas/v1.1/server.rng (+3/-3)
nova/api/openstack/servers.py (+98/-128)
nova/api/openstack/versions.py (+87/-167)
nova/api/openstack/views/versions.py (+1/-1)
nova/api/openstack/wsgi.py (+5/-0)
nova/tests/api/openstack/common.py (+22/-0)
nova/tests/api/openstack/contrib/test_createserverext.py (+5/-1)
nova/tests/api/openstack/test_common.py (+82/-54)
nova/tests/api/openstack/test_flavors.py (+106/-101)
nova/tests/api/openstack/test_images.py (+205/-185)
nova/tests/api/openstack/test_limits.py (+57/-37)
nova/tests/api/openstack/test_servers.py (+204/-76)
nova/tests/api/openstack/test_versions.py (+258/-360)
nova/tests/integrated/test_xml.py (+6/-6)
tools/pip-requires (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #814196: OSAPI XML Serialization is missing xml document header

Low

Fix Released

Link a bug report

Related blueprints

1529. By Naveed Massjouni on 2011-09-13

Merge from trunk.

1528. By Naveed Massjouni on 2011-09-13

And again.

1527. By Naveed Massjouni on 2011-09-13

Same as last time.

1526. By Naveed Massjouni on 2011-09-12

Made tests version version links more robust

1525. By Naveed Massjouni on 2011-09-12

Merge from trunk

1524. By Naveed Massjouni on 2011-09-10

Merge from trunk

1523. By Naveed Massjouni on 2011-09-09

pep 8

1522. By Naveed Massjouni on 2011-09-09

Fixing security groups stuff

1521. By Naveed Massjouni on 2011-09-08

Merge from trunk

1520. By Naveed Massjouni on 2011-09-04

Minor cleanup.