summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-13 22:49:32 +0000
committerGerrit Code Review <review@openstack.org>2017-09-13 22:49:32 +0000
commit270f46e66bc0a720b6c27abc689008d160fa574e (patch)
treeec6147aa8d82863e46e5fdc48c8e5a637575914c
parentb23bf3cefa1cfb93aca487f7b3ab281c78319c68 (diff)
parente1a1e88b4e61a4e6a640bf758c77efe6376c08dd (diff)
Merge "Updated from global requirements"
-rw-r--r--requirements.txt8
-rw-r--r--test-requirements.txt4
2 files changed, 6 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt
index 4521a34..1be4d30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,12 +7,12 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
7eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT 7eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
8Flask!=0.11,<1.0,>=0.10 # BSD 8Flask!=0.11,<1.0,>=0.10 # BSD
9SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT 9SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
10oslo.cache>=1.5.0 # Apache-2.0 10oslo.cache>=1.22.0 # Apache-2.0
11oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0 11oslo.config>=4.6.0 # Apache-2.0
12oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0 12oslo.messaging>=5.29.0 # Apache-2.0
13oslo.log>=3.30.0 # Apache-2.0 13oslo.log>=3.30.0 # Apache-2.0
14oslo.db>=4.24.0 # Apache-2.0 14oslo.db>=4.24.0 # Apache-2.0
15oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0 15oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
16keystoneauth1>=3.2.0 # Apache-2.0 16keystoneauth1>=3.2.0 # Apache-2.0
17python-keystoneclient>=3.8.0 # Apache-2.0 17python-keystoneclient>=3.8.0 # Apache-2.0
18requests>=2.14.2 # Apache-2.0 18requests>=2.14.2 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b01ffcc..8f3209d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,12 +2,12 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5os-testr>=0.8.0 # Apache-2.0 5os-testr>=1.0.0 # Apache-2.0
6testtools>=1.4.0 # MIT 6testtools>=1.4.0 # MIT
7flake8<2.6.0,>=2.5.4 # MIT 7flake8<2.6.0,>=2.5.4 # MIT
8mock>=2.0.0 # BSD 8mock>=2.0.0 # BSD
9requests-mock>=1.1.0 # Apache-2.0 9requests-mock>=1.1.0 # Apache-2.0
10bashate>=0.2 # Apache-2.0 10bashate>=0.5.1 # Apache-2.0
11 11
12hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 12hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
13 13