← Back to branch summary

~rackspace-ozone/rackspace-nova/development

« back to all changes in this revision

Viewing changes to nova/api/openstack/versions.py

  • Committer: paul at openstack
  • Date: 2011-09-26 18:57:03 UTC
  • mfrom: (1098.1.519 nova)
  • Revision ID: paul@openstack.org-20110926185703-ad3bthrj309itbrw
merging Diablo

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/versions.py
107
107
            headers_serializer=headers_serializer)
108
108
 
109
109
        supported_content_types = ('application/json',
 
110
                                   'application/vnd.openstack.compute+json',
110
111
                                   'application/xml',
 
112
                                   'application/vnd.openstack.compute+xml',
111
113
                                   'application/atom+xml')
112
114
        deserializer = VersionsRequestDeserializer(
113
115
            supported_content_types=supported_content_types)
308
310
    serializer = wsgi.ResponseSerializer(body_serializers)
309
311
 
310
312
    supported_content_types = ('application/json',
 
313
                               'application/vnd.openstack.compute+json',
311
314
                               'application/xml',
 
315
                               'application/vnd.openstack.compute+xml',
312
316
                               'application/atom+xml')
313
317
    deserializer = wsgi.RequestDeserializer(
314
318
        supported_content_types=supported_content_types)