Merge "Updated from global requirements"

2014-02-27 20:17:07 +00:00 · 2014-02-27 20:17:07 +00:00 · 2c0bfc7009
commit 2c0bfc7009
parent f3b63a2dc7 383db9fe98
2 changed files with 2 additions and 2 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -23,7 +23,7 @@ python-novaclient>=2.15.0
 python-swiftclient>=1.6
 PyYAML>=3.1.0
 requests>=1.1
-six>=1.4.1
+six>=1.5.2
 SQLAlchemy>=0.7.8,<=0.8.99
 sqlalchemy-migrate>=0.8.2
 stevedore>=0.14
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -16,6 +16,6 @@ sphinx>=1.1.2,<1.2
 sphinxcontrib-docbookrestapi
 sphinxcontrib-httpdomain
 sphinxcontrib-pecanwsme>=0.6
-testrepository>=0.0.17
+testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34