← Back to branch summary

~ubuntu-branches/ubuntu/utopic/cinder/utopic

« back to all changes in this revision

Viewing changes to cinder/api/v2/snapshot_metadata.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Adam Gandelman, Chuck Short
  • Date: 2013-09-08 21:09:46 UTC
  • mfrom: (1.1.18)
  • Revision ID: package-import@ubuntu.com-20130908210946-3dbzq1jy5uji4wad
Tags: 1:2013.2~b3-0ubuntu1
https://launchpad.net/bugs/1190791
[ James Page ]
* d/control: Switch ceph-common -> python-ceph inline with upstream
  refactoring of Ceph RBD driver, move to Suggests of python-cinder.
  (LP: #1190791). 

[ Adam Gandelman ]
* debian/patches/avoid_paramiko_vers_depends.patch: Dropped, no longer
  required.
* Add minimum requirement python-greenlet (>= 0.3.2).
* Add minimum requirement python-eventlet (>= 0.12.0).
* Add minimum requirement python-paramiko (>= 1.8).

[ Chuck Short ]
* New upstream release.
* debian/patches/skip-sqlachemy-failures.patch: Skip testfailures
  with sqlalchemy 0.8 until they are fixed upstream.
* debian/control: Add python-babel to build-depends.
* debian/control: Add python-novaclient to build-depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cinder/api/v2/snapshot_metadata.py
124
124
            raise exc.HTTPBadRequest(explanation=msg)
125
125
 
126
126
        except exception.InvalidVolumeMetadata as error:
127
 
            raise exc.HTTPBadRequest(explanation=unicode(error))
 
127
            raise exc.HTTPBadRequest(explanation=error.msg)
128
128
 
129
129
        except exception.InvalidVolumeMetadataSize as error:
130
 
            raise exc.HTTPRequestEntityTooLarge(explanation=unicode(error))
 
130
            raise exc.HTTPRequestEntityTooLarge(explanation=error.msg)
131
131
 
132
132
    @wsgi.serializers(xml=common.MetaItemTemplate)
133
133
    def show(self, req, snapshot_id, id):