Cinder

Merge lp:~zulcss/cinder/rc2-fix into lp:~openstack-ubuntu-testing/cinder/grizzly

  1. rc2-fix
  2. Merge into grizzly
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 92
Merged at revision: 92
Proposed branch: lp:~zulcss/cinder/rc2-fix
Merge into: lp:~openstack-ubuntu-testing/cinder/grizzly
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~zulcss/cinder/rc2-fix
Reviewer Review Type Date Requested Status
James Page Approve
Yolanda Robla (community) Approve
Review via email: mp+155223@code.launchpad.net

Description of the change

fixes typo in previous commit.

To post a comment you must log in.
Revision history for this message
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve
Revision history for this message
James Page (james-page) wrote :

Build tested OK - discuss the fact that the package still generates a dependency on rtslib with zul - will be raised upstream.

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-03-25 12:59:47 +0000
3+++ debian/changelog 2013-03-25 13:33:22 +0000
4@@ -1,3 +1,9 @@
5+cinder (1:2013.1~rc2-0ubuntu2) raring; urgency=low
6+
7+ * debian/rules: Fix FTBFS, we want '-v' and not '-V'.
8+
9+ -- Chuck Short <zulcss@ubuntu.com> Mon, 25 Mar 2013 08:30:42 -0500
10+
11 cinder (1:2013.1~rc2-0ubuntu1) raring; urgency=low
12
13 * New upstream release.
14
15=== modified file 'debian/rules'
16--- debian/rules 2013-03-25 12:59:38 +0000
17+++ debian/rules 2013-03-25 13:33:22 +0000
18@@ -15,7 +15,7 @@
19
20 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
21 override_dh_auto_test:
22- PYTHONPATH=$(CURDIR) bash run_tests.sh -N -V
23+ PYTHONPATH=$(CURDIR) bash run_tests.sh -N -v
24 endif
25
26 override_dh_install:

Subscribers

People subscribed via source and target branches