Merge lp:~zulcss/python-novaclient/grizzly-ftbfs into lp:~openstack-ubuntu-testing/python-novaclient/grizzly

Proposed by Chuck Short
Status: Merged
Merged at revision: 59
Proposed branch: lp:~zulcss/python-novaclient/grizzly-ftbfs
Merge into: lp:~openstack-ubuntu-testing/python-novaclient/grizzly
Diff against target: 24 lines (+2/-1)
2 files modified
debian/changelog (+1/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~zulcss/python-novaclient/grizzly-ftbfs
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+143546@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Minor nit - trailing comma on the last BD (existing issue but nice to fix now.)

Other than that 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 2012-12-29 18:59:06 +0000
3+++ debian/changelog 2013-01-16 16:43:25 +0000
4@@ -2,6 +2,7 @@
5
6 * New upstream release.
7 * debian/control: Add python-requests as a build-dep.
8+ * debian/control: Use python-testtools instead of python-unittest2
9
10 -- Chuck Short <zulcss@ubuntu.com> Sat, 29 Dec 2012 12:57:45 -0600
11
12
13=== modified file 'debian/control'
14--- debian/control 2012-12-29 18:59:06 +0000
15+++ debian/control 2013-01-16 16:43:25 +0000
16@@ -13,7 +13,7 @@
17 python-requests,
18 python-prettytable (>= 0.6),
19 python-simplejson,
20- python-unittest2,
21+ python-testtools,
22 X-Python-Version: >= 2.7
23 Standards-Version: 3.9.3
24 Vcs-Browser: https://bazaar.launchpad.net/~openstack-ubuntu-packagers/python-novaclient/ubuntu/files

Subscribers

People subscribed via source and target branches