aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-20 17:39:02 +0000
committerGerrit Code Review <review@openstack.org>2015-08-20 17:39:02 +0000
commit2b01412ab9ae0257f2f76970b189b1668f324a28 (patch)
tree2483dc54378e1e84d0cfd6843c383cd50f6cceba
parentf9a2b0640a4ed74c7c882bfaf10094ac61bc40ab (diff)
parent5d671a56821bb3830dba6d739a1ddbd16ee6360f (diff)
downloadkolla-2b01412ab9ae0257f2f76970b189b1668f324a28.tar.gz
kolla-2b01412ab9ae0257f2f76970b189b1668f324a28.zip
Merge "The requirements.txt file isn't correct"
-rwxr-xr-xrequirements.txt3
-rw-r--r--test-requirements.txt1
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index 10fa56100..4c7ccfae1 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
-docker-compose==1.3.0
+docker-py>=1.1.0 # Apache-2.0
+Jinja2>=2.6 # BSD License (3 clause)
diff --git a/test-requirements.txt b/test-requirements.txt
index dc12a067b..269d9f566 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,4 +14,3 @@ python-swiftclient>=2.2.0
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.36,!=1.2.0
-jinja2