Merge "Updated from global requirements"

requirements.txt

@@ -9,7 +9,7 @@ argparse
 boto>=2.32.1
 decorator>=3.4.0
 eventlet>=0.15.2
-Jinja2
+Jinja2>=2.6  # BSD License (3 clause)
 keystonemiddleware>=1.0.0
 kombu>=2.5.0
 lxml>=2.3
@@ -31,7 +31,7 @@ python-cinderclient>=1.1.0
 python-neutronclient>=2.3.6,<3
 python-glanceclient>=0.14.0
 six>=1.7.0
-stevedore>=1.0.0  # Apache-2.0
+stevedore>=1.1.0  # Apache-2.0
 websockify>=0.6.0,<0.7
 wsgiref>=0.1.2
 oslo.config>=1.4.0  # Apache-2.0

test-requirements.txt

@@ -17,6 +17,6 @@ python-ironicclient>=0.2.1
 python-subunit>=0.0.18
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
 oslosphinx>=2.2.0  # Apache-2.0
-oslotest>=1.1.0  # Apache-2.0
+oslotest>=1.2.0  # Apache-2.0
 testrepository>=0.0.18
 testtools>=0.9.34