Merge lp:~gandelman-a/ubuntu/saucy/nova/kombu_min into lp:~ubuntu-server-dev/nova/havana

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 596
Merged at revision: 596
Proposed branch: lp:~gandelman-a/ubuntu/saucy/nova/kombu_min
Merge into: lp:~ubuntu-server-dev/nova/havana
Diff against target: 33 lines (+3/-2)
2 files modified
debian/changelog (+1/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/nova/kombu_min
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+175366@code.launchpad.net

Description of the change

Set version requirement python-kombu (>= 2.5.12).

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-07-16 15:16:30 +0000
3+++ debian/changelog 2013-07-17 18:37:26 +0000
4@@ -5,6 +5,7 @@
5 upper version limit on requests dependency, which was capped upstream
6 to fix centos-related gating issues.
7 * debian/control:
8+ - Set version requirement python-kombu (>= 2.5.12).
9 - Set version requirement python-pyparsing (>= 1.5.6).
10 - Add websockify to nova-spiceproxy Depends.
11 - Add spice-html5 to nova-spiceproxy Depends (LP: #1197119)
12
13=== modified file 'debian/control'
14--- debian/control 2013-07-15 17:50:51 +0000
15+++ debian/control 2013-07-17 18:37:26 +0000
16@@ -24,7 +24,7 @@
17 python-feedparser,
18 python-glanceclient,
19 python-iso8601,
20- python-kombu,
21+ python-kombu (>= 2.5.12),
22 python-lxml,
23 python-migrate,
24 python-mox,
25@@ -76,7 +76,7 @@
26 python-glanceclient,
27 python-iso8601,
28 python-keystone,
29- python-kombu,
30+ python-kombu (>= 2.5.12),
31 python-ldap,
32 python-libxml2,
33 python-lockfile,

Subscribers

People subscribed via source and target branches