diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-08 15:01:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-08 15:01:57 +0000 |
| commit | 9825eb17d64d1b2134d553d41661e7499402fe72 (patch) | |
| tree | d6739ee7cd79fdd955b15451c0a3b1c122d0819d | |
| parent | 3345d5b164addfc65501954573ab01bac0ec74d9 (diff) | |
| parent | 91439069a73af0c105706c949291272422471247 (diff) | |
| download | glance-9825eb17d64d1b2134d553d41661e7499402fe72.tar.gz | |
Merge "Updated from global requirements" into proposed/juno
| -rw-r--r-- | requirements.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index 14e24ac87..952e7145b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ argparse boto>=2.32.1 sqlalchemy-migrate>=0.9.1,!=0.9.2 httplib2>=0.7.5 -kombu>=2.4.8 +kombu>=2.5.0 pycrypto>=2.6 iso8601>=0.1.9 ordereddict @@ -42,7 +42,7 @@ oslo.vmware>=0.6.0 # Apache-2.0 Paste jsonschema>=2.0.0,<3.0.0 -python-cinderclient>=1.0.7 +python-cinderclient>=1.1.0 python-keystoneclient>=0.10.0 pyOpenSSL>=0.11 @@ -53,7 +53,7 @@ oslo.db>=1.0.0 # Apache-2.0 oslo.i18n>=1.0.0 # Apache-2.0 oslo.messaging>=1.4.0 -retrying>=1.2.2 # Apache-2.0 +retrying>=1.2.2,!=1.3.0 # Apache-2.0 osprofiler>=0.3.0 # Apache-2.0 # Glance Store |