diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-30 20:52:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-30 20:52:53 +0000 |
| commit | d8391cfc13ec8791f9daa09b37b806d2c59b26b3 (patch) | |
| tree | 7cb9f3cecdd68789064b597da78b818826f03d9c | |
| parent | 82b76dcf67d8eaea9752042e92dcabb9397f61c0 (diff) | |
| parent | fc00820ae8b25ca3934bc45b543474a234dff72f (diff) | |
| download | ceilometer-d8391cfc13ec8791f9daa09b37b806d2c59b26b3.tar.gz | |
Merge "Updated from global requirements" into stable/liberty5.0.1
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt index 6eb0dee2..f7931729 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ eventlet>=0.17.4 jsonpath-rw-ext>=0.1.7 jsonschema!=2.5.0,<3.0.0,>=2.0.0 kafka-python>=0.9.2 # Apache-2.0 -keystonemiddleware>=2.0.0 +keystonemiddleware!=2.4.0,>=2.0.0 lxml>=2.3 msgpack-python>=0.4.0 oslo.context>=0.2.0 # Apache-2.0 @@ -24,14 +24,14 @@ oslo.service>=0.7.0 # Apache-2.0 PasteDeploy>=1.5.0 pbr>=1.6 pecan>=1.0.0 -oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1,>=1.16.0 # Apache-2.0 +oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1,!=2.7.0,!=2.8.0,!=2.8.1,!=2.9.0,>=1.16.0 # Apache-2.0 oslo.middleware>=2.8.0 # Apache-2.0 oslo.serialization>=1.4.0 # Apache-2.0 oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0 pysnmp<5.0.0,>=4.2.1 python-ceilometerclient>=1.5.0 python-glanceclient>=0.18.0 -python-keystoneclient>=1.6.0 +python-keystoneclient!=1.8.0,>=1.6.0 python-neutronclient>=2.6.0 python-novaclient!=2.33.0,>=2.28.1 python-swiftclient>=2.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 23f1d4a6..a34286fc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,7 @@ mock>=1.2 PyMySQL>=0.6.2 # MIT License # Docs Requirements oslosphinx>=2.5.0 # Apache-2.0 -reno>=0.1.1 # Apache2 +reno>=0.1.1 # Apache2 oslotest>=1.10.0 # Apache-2.0 oslo.vmware>=1.16.0 # Apache-2.0 psycopg2>=2.5 |