Merge lp:~corey.bryant/horizon/2014.1.4-0ubuntu2 into lp:~ubuntu-server-dev/horizon/icehouse

Proposed by Corey Bryant on 2015-03-29
Status: Merged
Merged at revision: 202
Proposed branch: lp:~corey.bryant/horizon/2014.1.4-0ubuntu2
Merge into: lp:~ubuntu-server-dev/horizon/icehouse
Diff against target: 33 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~corey.bryant/horizon/2014.1.4-0ubuntu2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2015-03-29 Pending
Review via email: mp+254508@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 2015-03-19 08:59:10 +0000
3+++ debian/changelog 2015-03-29 19:22:05 +0000
4@@ -1,3 +1,9 @@
5+horizon (1:2014.1.4-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).
8+
9+ -- Corey Bryant <corey.bryant@canonical.com> Sun, 29 Mar 2015 14:53:18 -0400
10+
11 horizon (1:2014.1.4-0ubuntu1) trusty; urgency=medium
12
13 * Resynchronize with stable/icehouse (b14a2ec) (LP: #1432608):
14
15=== modified file 'debian/control'
16--- debian/control 2014-02-25 14:41:37 +0000
17+++ debian/control 2015-03-29 19:22:05 +0000
18@@ -12,6 +12,7 @@
19 python-nose,
20 python-pbr,
21 python-setuptools,
22+ python-six (>= 1.5.2),
23 python-sphinx
24 Standards-Version: 3.9.3
25 Homepage: http://launchpad.net/horizon
26@@ -36,6 +37,7 @@
27 python-neutronclient,
28 python-novaclient,
29 python-openstack-auth (>= 1.1.1),
30+ python-six (>= 1.5.2),
31 python-swiftclient,
32 python-troveclient,
33 python-tz,

Subscribers

People subscribed via source and target branches