summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-14 04:55:38 +0000
committerGerrit Code Review <review@openstack.org>2017-07-14 04:55:38 +0000
commitf5ce4279b968d04674ea32052cfe83f9a1aaddb8 (patch)
tree55be82ae1a33af685a24cceb911c1f937bb67e7a
parenteedd42b299dc29a5205ac6b96fca73727ec87caf (diff)
parent9453809ce584655f5f1daeea712f5cf3e1a54416 (diff)
Merge "Blacklist pymod2pkg 0.8.0"1.1.0
-rw-r--r--global-requirements.txt2
-rw-r--r--upper-constraints.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/global-requirements.txt b/global-requirements.txt
index cfee340..904ceea 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -192,7 +192,7 @@ pykmip>=0.5.0 # Apache 2.0 License
192pyldap>=2.4.20 # PSF 192pyldap>=2.4.20 # PSF
193pylxd>=2.2.2 # Apache-2.0 193pylxd>=2.2.2 # Apache-2.0
194pymemcache>=1.2.9,!=1.3.0 # Apache 2.0 License 194pymemcache>=1.2.9,!=1.3.0 # Apache 2.0 License
195pymod2pkg>=0.7.0 # Apache-2.0 195pymod2pkg>=0.7.0,!=0.8.0 # Apache-2.0
196pymongo>=3.0.2,!=3.1 # Apache-2.0 196pymongo>=3.0.2,!=3.1 # Apache-2.0
197PyMySQL>=0.7.6 # MIT License 197PyMySQL>=0.7.6 # MIT License
198python-etcd>=0.4.3 # MIT License 198python-etcd>=0.4.3 # MIT License
diff --git a/upper-constraints.txt b/upper-constraints.txt
index c2081dd..e941eeb 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -509,7 +509,7 @@ xvfbwrapper===0.2.9
509futures===3.1.1;python_version=='2.7' 509futures===3.1.1;python_version=='2.7'
510tosca-parser===0.8.1 510tosca-parser===0.8.1
511Flask===0.12.2 511Flask===0.12.2
512pymod2pkg===0.8.0 512pymod2pkg===0.7.8
513happybase===1.1.0;python_version=='2.7' 513happybase===1.1.0;python_version=='2.7'
514marathon===0.9.0 514marathon===0.9.0
515docker-py===1.10.6 515docker-py===1.10.6