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

Subscribers

People subscribed via source and target branches