summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-18 09:24:39 +0000
committerGerrit Code Review <review@openstack.org>2017-08-18 09:24:39 +0000
commit9a31e6bd406b18b32a97bd11d0020426dd6ff318 (patch)
treec7decb70e38789f6238052c5a61db72744fe6df6
parent56765e2f619e8d9f1600b6937dca1371b026b4b7 (diff)
parent1f048b6fb4d1893aae8b9dedc93b9040181c0698 (diff)
Merge "Updated from global requirements" into stable/pikestable/pike
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index 5f543e6..992069f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4pbr!=2.1.0,>=2.0.0 # Apache-2.0 4pbr!=2.1.0,>=2.0.0 # Apache-2.0
5PrettyTable<0.8,>=0.7.1 # BSD 5PrettyTable<0.8,>=0.7.1 # BSD
6python-glanceclient>=2.7.0 # Apache-2.0 6python-glanceclient>=2.8.0 # Apache-2.0
7python-keystoneclient>=3.8.0 # Apache-2.0 7python-keystoneclient>=3.8.0 # Apache-2.0
8iso8601>=0.1.11 # MIT 8iso8601>=0.1.11 # MIT
9six>=1.9.0 # MIT 9six>=1.9.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 617919b..85553a4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,6 +14,6 @@ testtools>=1.4.0 # MIT
14oslotest>=1.10.0 # Apache-2.0 14oslotest>=1.10.0 # Apache-2.0
15 15
16# doc build requirements 16# doc build requirements
17openstackdocstheme>=1.11.0 # Apache-2.0 17openstackdocstheme>=1.16.0 # Apache-2.0
18sphinx>=1.6.2 # BSD 18sphinx>=1.6.2 # BSD
19reno!=2.3.1,>=1.8.0 # Apache-2.0 19reno!=2.3.1,>=1.8.0 # Apache-2.0