From 1f5730d9933ff0ccc3da76a999589afba92207fb Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Thu, 1 May 2014 13:44:26 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: If8e08b4fb3fa32c9e9b6945a6833c97f4b499f1f
---
 requirements.txt | 4 ++--
 setup.py         | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 11d7d6c27a..dfc31bb796 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,11 +15,11 @@ python-ceilometerclient>=1.0.6
 python-cinderclient>=1.0.6
 python-glanceclient>=0.9.0
 python-heatclient>=0.2.3
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.8.0
 python-neutronclient>=2.3.4,<3
 python-novaclient>=2.17.0
 python-saharaclient>=0.6.0
 python-swiftclient>=1.6
-python-troveclient>=1.0.3
+python-troveclient>=1.0.4
 pytz>=2010h
 six>=1.6.0
diff --git a/setup.py b/setup.py
index 70c2b3f32b..736375744d 100755
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,14 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)