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

Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 91
Merged at revision: 91
Proposed branch: lp:~zulcss/cinder/rc2
Merge into: lp:~openstack-ubuntu-testing/cinder/grizzly
Diff against target: 30 lines (+5/-3)
2 files modified
debian/changelog (+4/-2)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~zulcss/cinder/rc2
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+155218@code.launchpad.net

Description of the change

cinder rc2

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

Looks good to me

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-22 12:40:00 +0000
3+++ debian/changelog 2013-03-25 13:02:45 +0000
4@@ -1,9 +1,11 @@
5-cinder (1:2013.1~rc1-0ubuntu2) UNRELEASED; urgency=low
6+cinder (1:2013.1~rc2-0ubuntu1) raring; urgency=low
7
8+ * New upstream release.
9 * debian/control, debian/cinder-volume.install: Dropped rtstool and python-rtslib
10 since it was dropped upstream.
11+ * debian/rules: Run tests more verbosely.
12
13- -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Mar 2013 07:37:53 -0500
14+ -- Chuck Short <zulcss@ubuntu.com> Mon, 25 Mar 2013 07:59:45 -0500
15
16 cinder (1:2013.1~rc1-0ubuntu1) raring; urgency=low
17
18
19=== modified file 'debian/rules'
20--- debian/rules 2013-02-26 14:12:33 +0000
21+++ debian/rules 2013-03-25 13:02:45 +0000
22@@ -15,7 +15,7 @@
23
24 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
25 override_dh_auto_test:
26- PYTHONPATH=$(CURDIR) bash run_tests.sh -N
27+ PYTHONPATH=$(CURDIR) bash run_tests.sh -N -V
28 endif
29
30 override_dh_install:

Subscribers

People subscribed via source and target branches