[Merge] lp:~corey.bryant/cinder/2014.1.1 into lp:~ubuntu-server-dev/cinder/icehouse

[Chuck Short]

Review: Needs Fixing

See inline comments.

Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-04-17 10:32:18 +0000
> +++ debian/changelog	2014-06-09 18:02:48 +0000
> @@ -1,3 +1,25 @@
> +cinder (1:2014.1.1-0ubuntu1) trusty; urgency=medium
> +
> +  * debian/patches/fix-requirements.patch: Refreshed.
> +  * Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
> +    - [d58abc1] Update cinder.conf
> +    - [5330d3b] Updated from global requirements
> +    - [41127fb] Properly initialize rpc in cinder-volume-usage-audit
> +    - [75fa69d] Storwize/SVC driver crashes when check volume copy status
> +    - [bc585a0] Fix solaris_execute in SolarisISCSIDriver.
> +    - [bc0442a] Fix wrong exception reference
> +    - [59fe59e] Correct metadata ordering issue in tests
> +    - [1e48833] Fallback to None on missing Glance image attrs
> +    - [767c2a6] Keep volume available if retype fails due to quota
> +    - [d0602f6] Fixes cinder error state volume delete on Windows
> +    - [1815c72] Re-raise exceptions in upload-to-image
> +    - [560740f] GlusterFS: Delete active snapshot file on volume delete.
> +    - [d17277d] Add exception catch if Storwize/SVC driver failed when retyping
> +    - [49446bc] Disable oslo.messaging debug logs
> +    - [aa0e752] Adjust sample config for keystoneclient 0.8.0 release
> +
> + -- Corey Bryant <corey.bryant at canonical.com>  Mon, 09 Jun 2014 13:54:04 -0400
> +
>  cinder (1:2014.1-0ubuntu1) trusty; urgency=medium
>  
>    * New upstream release (LP: #1299055).
> 
> === modified file 'debian/patches/fix-requirements.patch'
> --- debian/patches/fix-requirements.patch	2014-03-26 14:31:55 +0000
> +++ debian/patches/fix-requirements.patch	2014-06-09 18:02:48 +0000
> @@ -7,7 +7,7 @@
>   Routes>=1.12.3
>   taskflow>=0.1.3,<0.2
>  -rtslib-fb>=2.1.39
> - six>=1.5.2

This change should probably be reverted since we dont have six>= 1.6.0 in trusty.

> + six>=1.6.0
>   SQLAlchemy>=0.7.8,<=0.9.99
>   sqlalchemy-migrate>=0.8.2,!=0.8.4
>  
> 


-- 
https://code.launchpad.net/~corey.bryant/cinder/2014.1.1/+merge/222525
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/cinder/icehouse.