neutron

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

  1. 2014.1.4-0ubuntu2
  2. Merge into icehouse
Proposed by Corey Bryant
Status: Merged
Merged at revision: 269
Proposed branch: lp:~corey.bryant/neutron/2014.1.4-0ubuntu2
Merge into: lp:~ubuntu-server-dev/neutron/icehouse
Diff against target: 35 lines (+8/-2)
2 files modified
debian/changelog (+6/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~corey.bryant/neutron/2014.1.4-0ubuntu2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+254509@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 09:00:45 +0000
3+++ debian/changelog 2015-03-29 19:28:16 +0000
4@@ -1,3 +1,9 @@
5+neutron (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:56:40 -0400
10+
11 neutron (1:2014.1.4-0ubuntu1) trusty; urgency=medium
12
13 * Resynchronize with stable/icehouse (036ef73) (LP: #1432608):
14
15=== modified file 'debian/control'
16--- debian/control 2014-04-11 07:31:26 +0000
17+++ debian/control 2015-03-29 19:28:16 +0000
18@@ -38,7 +38,7 @@
19 python-routes,
20 python-setuptools,
21 python-simplejson,
22- python-six,
23+ python-six (>= 1.5.2),
24 python-sqlalchemy,
25 python-stevedore (>= 0.10),
26 python-testtools (>= 0.9.32),
27@@ -442,7 +442,7 @@
28 python-psutil (>= 0.6.1),
29 python-requests (>= 1.1),
30 python-routes,
31- python-six,
32+ python-six (>= 1.5.2),
33 python-sqlalchemy (>= 0.8.2),
34 python-stevedore (>= 0.10),
35 python-webob,

Subscribers

People subscribed via source and target branches