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

Proposed by Chuck Short
Status: Merged
Merged at revision: 67
Proposed branch: lp:~zulcss/python-novaclient/ftbfs
Merge into: lp:~openstack-ubuntu-testing/python-novaclient/grizzly
Diff against target: 29 lines (+11/-0)
2 files modified
debian/changelog (+9/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~zulcss/python-novaclient/ftbfs
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+155992@code.launchpad.net

Description of the change

ftbfs

To post a comment you must log in.

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-02-25 18:04:12 +0000
3+++ debian/changelog 2013-03-28 15:24:40 +0000
4@@ -1,3 +1,12 @@
5+python-novaclient (1:2.12.0.6.g1696954-0ubuntu1) raring; urgency=low
6+
7+ * New upstream release.
8+ * debian/control:
9+ - Add python-setuptools dependency
10+ - Add python-setuptools-git dependency.
11+
12+ -- Chuck Short <zulcss@ubuntu.com> Thu, 28 Mar 2013 10:18:11 -0500
13+
14 python-novaclient (1:2.11.1-0ubuntu1) raring; urgency=low
15
16 * New upstream release.
17
18=== modified file 'debian/control'
19--- debian/control 2013-01-17 14:02:55 +0000
20+++ debian/control 2013-03-28 15:24:40 +0000
21@@ -13,6 +13,8 @@
22 python-nose,
23 python-requests,
24 python-prettytable (>= 0.6),
25+ python-setuptools-git,
26+ python-setuptools,
27 python-simplejson,
28 python-testtools
29 X-Python-Version: >= 2.7

Subscribers

People subscribed via source and target branches