Merge lp:~zulcss/cinder/cinder-refresh into lp:~ubuntu-server-dev/cinder/havana

[Chuck Short]

[James Page (james-page)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-19 17:53:46 +0000
+++ debian/changelog	2013-06-20 16:31:35 +0000
@@ -1,3 +1,10 @@
+cinder (1:2013.2.a197.gce2827b-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. 
+  * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
+
+ -- Chuck Short <[e-mail]>  Thu, 20 Jun 2013 11:21:19 -0500
+
 cinder (1:2013.2~b1-0ubuntu2) saucy; urgency=low
 
   [ Chuck Short ]

=== modified file 'debian/patches/avoid_paramiko_vers_depends.patch'
--- debian/patches/avoid_paramiko_vers_depends.patch	2013-06-19 17:52:19 +0000
+++ debian/patches/avoid_paramiko_vers_depends.patch	2013-06-20 16:31:35 +0000
@@ -5,10 +5,9 @@
 cherry-picked patch to avoid the bug that prompted the version requirement
 here.
 
-
-diff -Naurp cinder-2013.2.b1.orig/tools/pip-requires cinder-2013.2.b1/tools/pip-requires
---- cinder-2013.2.b1.orig/tools/pip-requires	2013-06-19 12:37:49.147728578 -0500
-+++ cinder-2013.2.b1/tools/pip-requires	2013-06-19 12:41:13.171728677 -0500
+diff -Naurp cinder-2013.2.a197.gce2827b.orig/requirements.txt cinder-2013.2.a197.gce2827b/requirements.txt
+--- cinder-2013.2.a197.gce2827b.orig/requirements.txt	2013-06-20 11:17:29.000000000 -0500
++++ cinder-2013.2.a197.gce2827b/requirements.txt	2013-06-20 11:23:41.027768315 -0500
 @@ -11,7 +11,7 @@ kombu>=1.0.4
  lockfile>=0.8
  lxml>=2.3