python-heatclient

Merge lp:~gnuoy/python-heatclient/juno-update-deps into lp:~ubuntu-server-dev/python-heatclient/juno

  1. juno-update-deps
  2. Merge into juno
Proposed by Liam Young
Status: Merged
Merged at revision: 17
Proposed branch: lp:~gnuoy/python-heatclient/juno-update-deps
Merge into: lp:~ubuntu-server-dev/python-heatclient/juno
Diff against target: 65 lines (+17/-8)
2 files modified
debian/changelog (+6/-2)
debian/control (+11/-6)
To merge this branch: bzr merge lp:~gnuoy/python-heatclient/juno-update-deps
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+225672@code.launchpad.net
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 2014-06-23 13:41:44 +0000
3+++ debian/changelog 2014-07-04 14:05:53 +0000
4@@ -1,8 +1,12 @@
5-python-heatclient (0.2.9-0ubuntu2) UNRELEASED; urgency=medium
6+python-heatclient (0.2.9-0ubuntu3) UNRELEASED; urgency=medium
7
8+ [ Chuck Short ]
9 * debian/patches/skip-ubuntu-tests.patch: Skip failing test.
10
11- -- Chuck Short <zulcss@ubuntu.com> Mon, 23 Jun 2014 09:41:25 -0400
12+ [ Liam Young ]
13+ * debian/control: Merged in deps from requirements.txt
14+
15+ -- Liam Young <liam.young@canonical.com> Thu, 03 Jul 2014 14:20:25 +0100
16
17 python-heatclient (0.2.9-0ubuntu1) utopic; urgency=medium
18
19
20=== modified file 'debian/control'
21--- debian/control 2014-04-22 15:26:24 +0000
22+++ debian/control 2014-07-04 14:05:53 +0000
23@@ -15,19 +15,21 @@
24 python-coverage,
25 python-fixtures,
26 python-httplib2,
27- python-iso8601,
28- python-keystoneclient (>= 1:0.2),
29+ python-iso8601 (>= 0.1.9),
30+ python-keystoneclient (>= 1:0.9.0),
31 python-mock,
32 python-mox,
33 python-mox3,
34- python-pbr,
35+ python-pbr (>= 0.6),
36 python-prettytable (<< 0.8),
37 python-prettytable (>= 0.5),
38+ python-requests (>= 1.1),
39 python-setuptools (>= 0.6.24),
40 python-setuptools-git,
41+ python-six (>= 1.7.0),
42 python-testscenarios,
43 python-testtools,
44- python-yaml,
45+ python-yaml (>= 3.1.0),
46 testrepository
47 Standards-Version: 3.9.4
48 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/python-heatclient/juno/files
49@@ -39,11 +41,14 @@
50 Depends:
51 python (>= 2.7),
52 python-httplib2,
53- python-iso8601,
54- python-keystoneclient (>= 1:0.2),
55+ python-iso8601 (>= 0.1.9),
56+ python-keystoneclient (>= 1:0.9.0),
57 python-pkg-resources,
58 python-prettytable (<< 0.8),
59 python-prettytable (>= 0.5),
60+ python-requests (>= 1.1),
61+ python-six (>= 1.7.0),
62+ python-yaml (>= 3.1.0),
63 ${misc:Depends},
64 ${python:Depends},
65 ${wheezy-added-deps}

Subscribers

People subscribed via source and target branches