OpenStack Heat

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

  1. 2014.1.4-0ubuntu2
  2. Merge into icehouse
Proposed by Corey Bryant
Status: Merged
Merged at revision: 58
Proposed branch: lp:~corey.bryant/heat/2014.1.4-0ubuntu2
Merge into: lp:~ubuntu-server-dev/heat/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/heat/2014.1.4-0ubuntu2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+254507@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:57:14 +0000
3+++ debian/changelog 2015-03-29 19:21:21 +0000
4@@ -1,3 +1,9 @@
5+heat (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:48:05 -0400
10+
11 heat (2014.1.4-0ubuntu1) trusty; urgency=medium
12
13 * Resynchronize with stable/icehouse (2b4f7be) (LP: #1432608):
14
15=== modified file 'debian/control'
16--- debian/control 2014-04-11 19:37:44 +0000
17+++ debian/control 2015-03-29 19:21:21 +0000
18@@ -44,7 +44,7 @@
19 python-pastedeploy,
20 python-routes,
21 python-setuptools,
22- python-six,
23+ python-six (>= 1.5.2),
24 python-sphinx,
25 python-sqlalchemy (>= 0.7.8),
26 python-swiftclient,
27@@ -88,7 +88,7 @@
28 python-pastedeploy,
29 python-routes,
30 python-setuptools,
31- python-six,
32+ python-six (>= 1.5.2),
33 python-sqlalchemy (>= 0.7.8),
34 python-swiftclient,
35 python-webob (>= 1.2.3),

Subscribers

People subscribed via source and target branches