Merge lp:~zulcss/cinder/refresh-ftbfs into lp:~openstack-ubuntu-testing/cinder/havana

[Chuck Short]

patch refresh

[Andres Rodriguez (andreserl)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-31 15:01:05 +0000
+++ debian/changelog	2013-06-06 18:59:29 +0000
@@ -1,3 +1,10 @@
+cinder (1:2013.2.a82.gb7ceb40-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
+
+ -- Chuck Short <[e-mail]>  Thu, 06 Jun 2013 13:36:27 -0500
+
 cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
 
   [ Chuck Short ]

=== modified file 'debian/patches/avoid_paramiko_vers_depends.patch'
--- debian/patches/avoid_paramiko_vers_depends.patch	2013-05-24 02:13:46 +0000
+++ debian/patches/avoid_paramiko_vers_depends.patch	2013-06-06 18:59:29 +0000
@@ -5,12 +5,10 @@
 cherry-picked patch to avoid the bug that prompted the version requirement
 here.
 
-
-Index: cinder/tools/pip-requires
-===================================================================
---- cinder.orig/tools/pip-requires	2013-05-23 19:09:24.115223372 -0700
-+++ cinder/tools/pip-requires	2013-05-23 19:10:22.699221220 -0700
-@@ -11,7 +11,7 @@
+diff -Naurp cinder-2013.2.a82.gb7ceb40.orig/requirements.txt cinder-2013.2.a82.gb7ceb40/requirements.txt
+--- cinder-2013.2.a82.gb7ceb40.orig/requirements.txt	2013-06-06 13:32:53.000000000 -0500
++++ cinder-2013.2.a82.gb7ceb40/requirements.txt	2013-06-06 13:40:40.941873801 -0500
+@@ -11,7 +11,7 @@ kombu>=1.0.4
  lockfile>=0.8
  lxml>=2.3
  oslo.config>=1.1.0