From 6a8e9a70e9489a8f17405adf64462899d6a4ca81 Mon Sep 17 00:00:00 2001 From: Luis Pabon Date: Fri, 10 Jan 2014 19:44:39 -0500 Subject: Sync with OpenStack v1.11.0 Jan 10 2014 Updated tox.ini, functional tests, and proxy unit tests. BUG: https://bugs.launchpad.net/bugs/1268017 Change-Id: I5ff8359b8abdb8fe5ae82492c12f57c395992735 Signed-off-by: Luis Pabon Reviewed-on: http://review.gluster.org/6682 Reviewed-by: Thiago da Silva Tested-by: Thiago da Silva --- tools/test-requires | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/test-requires') diff --git a/tools/test-requires b/tools/test-requires index 6bf711e..d2c027f 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -8,7 +8,7 @@ nose nosexcover openstack.nose_plugin nosehtmloutput -sphinx>=1.1.2 +sphinx>=1.1.2,<1.2 mock>=0.8.0 python-keystoneclient prettytable -- cgit