| commit | ecd5254e74c6e7224b14af220f7810412f3ffe5e | [log] [tgz] |
|---|---|---|
| author | OpenStack Jenkins <jenkins@openstack.org> | Sat Apr 12 01:57:59 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Sat Apr 12 01:57:59 2014 +0000 |
| tree | beb22ba8acc696d916df7bdaa2d69a8a2f43bf18 | |
| parent | 60dd4702f561d9fb162b2d213b2ae8db66a16de3 [diff] | |
| parent | 41ab8c4a2092cb01951356392cd758357dad9e49 [diff] |
Merge "Updated from global requirements"
diff --git a/requirements.txt b/requirements.txt index a9e7aeb..e97eece 100644 --- a/requirements.txt +++ b/requirements.txt
@@ -1,4 +1,4 @@ -pbr>=0.6,<1.0 +pbr>=0.6,!=0.7,<1.0 anyjson>=0.3.3 httplib2>=0.7.5 jsonschema>=2.0.0,<3.0.0 @@ -17,7 +17,7 @@ python-saharaclient>=0.6.0 python-swiftclient>=1.6 testresources>=0.2.4 -keyring>=1.6.1,<2.0,>=2.1 +keyring>=2.1 testrepository>=0.0.18 oslo.config>=1.2.0 six>=1.5.2