Merge lp:~gandelman-a/ubuntu/saucy/cinder/drop_temp_paramiko_patch into lp:~ubuntu-server-dev/cinder/havana

[Adam Gandelman]

debian/patches/avoid_paramiko_vers_depends.patch: Dropped, no longer required.

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-23 10:59:07 +0000
+++ debian/changelog	2013-07-23 16:32:26 +0000
@@ -1,9 +1,14 @@
 cinder (1:2013.2~b2-0ubuntu4) UNRELEASED; urgency=low
 
+  [ 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.
+
  -- James Page <[e-mail]>  Tue, 23 Jul 2013 11:55:49 +0100
 
 cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low

=== removed file 'debian/patches/avoid_paramiko_vers_depends.patch'
--- debian/patches/avoid_paramiko_vers_depends.patch	2013-07-16 15:46:29 +0000
+++ debian/patches/avoid_paramiko_vers_depends.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-From: Adam Gandelman <[e-mail]>
-Date: Thu May 23 19:12:03 PDT 2013
-Remove version requirements of paramiko dependency until new upstream paramiko
-version is packaged.  Current version in Saucy (1.7.7.1-3.1ubuntu1) has a
-cherry-picked patch to avoid the bug that prompted the version requirement
-here.
-
-diff -Naurp cinder-2013.2.a359.g5be6852.orig/requirements.txt cinder-2013.2.a359.g5be6852/requirements.txt
---- cinder-2013.2.a359.g5be6852.orig/requirements.txt	2013-07-16 11:30:02.000000000 -0400
-+++ cinder-2013.2.a359.g5be6852/requirements.txt	2013-07-16 11:34:18.769962552 -0400
-@@ -11,7 +11,7 @@ kombu>2.4.7
- lockfile>=0.8
- lxml>=2.3
- oslo.config>=1.1.0
--paramiko>=1.8.0
-+paramiko
- paste
- pastedeploy>=1.5.0
- python-glanceclient>=0.9.0

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-22 14:03:56 +0000
+++ debian/patches/series	2013-07-23 16:32:26 +0000
@@ -1,2 +1,1 @@
-avoid_paramiko_vers_depends.patch
 fix-sqlalchemy-requirements.patch