Merge "Updated from global requirements"

This commit is contained in:
Jenkins
2015-10-02 20:15:16 +00:00
committed by Gerrit Code Review

View File

@@ -16,7 +16,7 @@ requests-mock>=0.6.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
# NOTE(tonyb): Pillow isn't used directly by nova but it's needed for
# sphinxcontrib-seqdiag. Make sure we honnor g-r caps
Pillow>=2.4.0,<3.0.0 # MIT
Pillow<3.0.0,>=2.4.0 # MIT
sphinxcontrib-seqdiag
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0