lp:~rackspace-titan/nova/openstack-api-versioned-controllers

Branch merges

Propose for merging

No branches dependent on this one.

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

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

Eric Day (community): Approve on 2011-03-23

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

Todd Willey (community): Approve on 2011-03-23

Brian Waldon (community): Approve on 2011-03-23

Joshua McKenty: Pending requested 2011-03-23

Diff: 723 lines (+219/-143)

12 files modified

etc/api-paste.ini (+13/-7)
nova/api/openstack/__init__.py (+27/-6)
nova/api/openstack/auth.py (+0/-2)
nova/api/openstack/common.py (+14/-3)
nova/api/openstack/servers.py (+55/-10)
nova/api/openstack/views/addresses.py (+2/-14)
nova/api/openstack/views/flavors.py (+1/-18)
nova/api/openstack/views/images.py (+1/-18)
nova/api/openstack/views/servers.py (+29/-44)
nova/tests/api/openstack/fakes.py (+11/-7)
nova/tests/api/openstack/test_auth.py (+2/-4)
nova/tests/api/openstack/test_servers.py (+64/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

818. By Naveed Massjouni on 2011-03-24

Fixed the docstring for common.get_id_from_href

817. By Naveed Massjouni on 2011-03-24

Merge from trunk

816. By Naveed Massjouni on 2011-03-24

Merge from trunk

815. By Naveed Massjouni on 2011-03-23

Should not call super __init__ twice in APIRouter

814. By Naveed Massjouni on 2011-03-23

Merge from trunk.

813. By Naveed Massjouni on 2011-03-23

Using super to call parent _setup_routes in APIRouter subclasses.

812. By Naveed Massjouni on 2011-03-22

Updating doc strings in accordance with PEP 257. Fixing order of imports in
common.py.

811. By Naveed Massjouni on 2011-03-22

Now using urlparse to parse a url to grab id out of it.

810. By Naveed Massjouni on 2011-03-22

Adding more docstrings. image_id and instance_type fields of an instance will
always exist, so no reason to check if keys exist.

809. By Brian Waldon on 2011-03-21

merging trunk