From 6dda4a751f7a8dda118963b37f4e4e1c5e13ac0f Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Fri, 10 Jul 2015 20:43:19 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: If68c8e463dc6f2b8118bb66626b5a73d81053b5d
---
 requirements.txt      | 2 +-
 test-requirements.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 19651eea0..8091c2b90 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ pbr<2.0,>=0.11
 
 oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
-oslo.log>=1.2.0  # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
 oslo.utils>=1.6.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 66359ded5..229cd4d25 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,8 @@ hacking<0.11,>=0.10.0
 
 discover
 fixtures>=1.3.1
-mock>=1.0
+mock>=1.0;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 mox3>=0.7.0
 python-subunit>=0.0.18
 testrepository>=0.0.18