Merge "Use os-testr for py34 tox target"

2015-10-02 20:14:32 +00:00
parent a1ae2d60aa 9537c85763
commit 915f03b26a
3 changed files with 454 additions and 246 deletions
@@ -20,6 +20,7 @@ Pillow>=2.4.0,<3.0.0 # MIT
 sphinxcontrib-seqdiag
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
+os-testr>=0.4.1
 testrepository>=0.0.18
 testtools>=1.4.0
 tempest-lib>=0.8.0