OpenStack Compute (nova)

Merge lp:~zulcss/nova/ftbfs-jan1 into lp:~ubuntu-server-dev/nova/icehouse

  1. ftbfs-jan1
  2. Merge into icehouse
Proposed by Chuck Short
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~zulcss/nova/ftbfs-jan1
Merge into: lp:~ubuntu-server-dev/nova/icehouse
Diff against target: 26 lines (+6/-2)
1 file modified
debian/patches/fix-requirements.patch (+6/-2)
To merge this branch: bzr merge lp:~zulcss/nova/ftbfs-jan1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+200847@code.launchpad.net

Description of the change

Pre-kombu fixes.

To post a comment you must log in.

Unmerged revisions

643. By Chuck Short

Refreshed requirements patch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/fix-requirements.patch'
2--- debian/patches/fix-requirements.patch 2013-12-12 14:08:51 +0000
3+++ debian/patches/fix-requirements.patch 2014-01-08 15:03:30 +0000
4@@ -1,5 +1,8 @@
5+Description: Fix requirements for Trusty.
6+Author: Chuck Short <zulcss@ubuntu.com>
7+Forwaded: No
8 diff --git a/requirements.txt b/requirements.txt
9-index de6d606..fb99aa3 100644
10+index 2edf621..fb99aa3 100644
11 --- a/requirements.txt
12 +++ b/requirements.txt
13 @@ -1,5 +1,5 @@
14@@ -18,11 +21,12 @@
15 greenlet>=0.3.2
16 PasteDeploy>=1.5.0
17 Paste
18-@@ -27,6 +27,5 @@ python-glanceclient>=0.9.0
19+@@ -27,7 +27,5 @@ python-glanceclient>=0.9.0
20 python-keystoneclient>=0.4.1
21 six>=1.4.1
22 stevedore>=0.12
23 -websockify>=0.5.1,<0.6
24+-wsgiref>=0.1.2
25 oslo.config>=1.2.0
26 pycadf>=0.1.9
27

Subscribers

People subscribed via source and target branches