Updated from global requirements

Change-Id: Iac446636fb3b5a19aee6c28389a409e5c1e630cf

requirements.txt

@@ -5,9 +5,8 @@
 netaddr!=0.7.16,>=0.7.13 # BSD
 neutron-lib>=0.4.0 # Apache-2.0
 oslo.config>=3.14.0 # Apache-2.0
-ovs>=2.5.0;python_version=='2.7' # Apache-2.0
-ovs>=2.6.0.dev3;python_version>='3.4' # Apache-2.0
+ovs>=2.6.0 # Apache-2.0
 pbr>=1.6 # Apache-2.0
-tenacity>=3.1.1  # Apache-2.0
+tenacity>=3.1.1 # Apache-2.0
 Babel>=2.3.4 # BSD
 six>=1.9.0 # MIT

test-requirements.txt

@@ -6,11 +6,11 @@ hacking<0.11,>=0.10.0
 
 coverage>=3.6 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 doc8 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-os-testr>=0.7.0 # Apache-2.0
+os-testr>=0.8.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testresources>=0.2.4 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD