← Back to branch summary

~corey.bryant/ceilometer/2014.1.4

« back to all changes in this revision

Viewing changes to debian/patches/fix-requirements.patch

  • Committer: Corey Bryant
  • Date: 2015-03-16 20:09:14 UTC
  • Revision ID: corey.bryant@canonical.com-20150316200914-hyyz12hrljyl7f6k
https://launchpad.net/bugs/1432608
* Resynchronize with stable/icehouse (c837d83) (LP: #1432608):
  - [bc9013b] Transform sample_cnt type to int
  - [449f9d5] Move oslo.vmware higher in requirements.txt
  - [28f5027] Fix listener for update.start notifications
  - [63d934b] ensure dispatcher service is configured before rpc
  - [2a546ac] Fix a response header bug in the error middleware
  - [c837d83] Iterates swift response earlier to get the correct status
* d/p/fix-requirements.patch: Rebased.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-requirements.patch
3
3
Forwarded: Not needed.
4
4
--- a/requirements.txt
5
5
+++ b/requirements.txt
6
 
@@ -16,8 +16,7 @@
7
 
 oslo.config>=1.2.0
8
 
 oslo.vmware>=0.2                        # Apache-2.0
 
6
@@ -18,8 +18,7 @@
 
7
 netaddr>=0.7.6
 
8
 oslo.config>=1.2.0,<1.5
9
9
 pbr>=0.6,<1.0
10
10
-pecan>=0.4.5
11
11
-pysnmp>=4.2.1,<5.0.0
12
12
+pecan>=0.3.0
13
 
 python-ceilometerclient>=1.0.6
14
 
 python-glanceclient>=0.9.0
15
 
 python-keystoneclient>=0.7.0
16
 
@@ -26,7 +25,7 @@
 
13
 python-ceilometerclient>=1.0.6,<=1.0.12
 
14
 python-glanceclient>=0.9.0,!=0.14.0,<=0.14.2
 
15
 python-keystoneclient>=0.7.0,<=0.11.2
 
16
@@ -28,7 +27,7 @@
17
17
 pytz>=2010h
18
18
 PyYAML>=3.1.0
19
19
 requests>=1.1
20
20
-six>=1.6.0
21
21
+six>=1.5.2
22
22
 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
23
 
 sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
24
 
 stevedore>=0.14
 
23
 sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
 
24
 stevedore>=0.14,<1.2