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

Proposed by Chuck Short on 2013-06-06
Status: Merged
Merged at revision: 106
Proposed branch: lp:~zulcss/cinder/refresh-ftbfs
Merge into: lp:~openstack-ubuntu-testing/cinder/havana
Diff against target: 35 lines (+11/-6)
2 files modified
debian/changelog (+7/-0)
debian/patches/avoid_paramiko_vers_depends.patch (+4/-6)
To merge this branch: bzr merge lp:~zulcss/cinder/refresh-ftbfs
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2013-06-06
Openstack Ubuntu Testers 2013-06-06 Pending
Review via email: mp+167831@code.launchpad.net

Description of the change

patch refresh

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-31 15:01:05 +0000
3+++ debian/changelog 2013-06-06 18:59:29 +0000
4@@ -1,3 +1,10 @@
5+cinder (1:2013.2.a82.gb7ceb40-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
9+
10+ -- Chuck Short <zulcss@ubuntu.com> Thu, 06 Jun 2013 13:36:27 -0500
11+
12 cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
13
14 [ Chuck Short ]
15
16=== modified file 'debian/patches/avoid_paramiko_vers_depends.patch'
17--- debian/patches/avoid_paramiko_vers_depends.patch 2013-05-24 02:13:46 +0000
18+++ debian/patches/avoid_paramiko_vers_depends.patch 2013-06-06 18:59:29 +0000
19@@ -5,12 +5,10 @@
20 cherry-picked patch to avoid the bug that prompted the version requirement
21 here.
22
23-
24-Index: cinder/tools/pip-requires
25-===================================================================
26---- cinder.orig/tools/pip-requires 2013-05-23 19:09:24.115223372 -0700
27-+++ cinder/tools/pip-requires 2013-05-23 19:10:22.699221220 -0700
28-@@ -11,7 +11,7 @@
29+diff -Naurp cinder-2013.2.a82.gb7ceb40.orig/requirements.txt cinder-2013.2.a82.gb7ceb40/requirements.txt
30+--- cinder-2013.2.a82.gb7ceb40.orig/requirements.txt 2013-06-06 13:32:53.000000000 -0500
31++++ cinder-2013.2.a82.gb7ceb40/requirements.txt 2013-06-06 13:40:40.941873801 -0500
32+@@ -11,7 +11,7 @@ kombu>=1.0.4
33 lockfile>=0.8
34 lxml>=2.3
35 oslo.config>=1.1.0

Subscribers

People subscribed via source and target branches