Merge "Updated from global requirements"

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

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