From 26b05be8b7d29191453d12848c98cbe11027a4e0 Mon Sep 17 00:00:00 2001
From: OpenStack Jenkins <jenkins@openstack.org>
Date: Fri, 11 Apr 2014 04:16:51 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 2e691aeb..6026e37f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ Babel>=1.3
 iso8601>=0.1.9
 netaddr>=0.7.6
 oslo.config>=1.2.0
-pbr>=0.6,<1.0
+pbr>=0.6,!=0.7,<1.0
 PrettyTable>=0.7,<0.8
 requests>=1.1
 six>=1.5.2
diff --git a/test-requirements.txt b/test-requirements.txt
index a54bc975..b69c9261 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@ discover
 fixtures>=0.3.14
 hacking>=0.8.0,<0.9
 httpretty>=0.8.0
-keyring>=1.6.1,<2.0,>=2.1
+keyring>=2.1
 mock>=1.0
 mox3>=0.7.0
 pycrypto>=2.6