From b95d747cfa7545e4d9d5a1656c44b715f6adeb9c Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Thu, 17 Sep 2015 10:20:17 +1200
Subject: [PATCH] Update our handling of pbr.

*) We're removing our upper caps - they are just time bombs. Make pbr
   be consistent here too.

*) pbr 1.8 handles comments in marker lines properly. We don't need to
   update the run-time minimum, but we do need a build-time minimum of
   1.8 to ensure OpenStack packages can build properly.

Change-Id: I9fe0c62e774c00c2e521e1e69c5f2f5d87865ec1
---
 global-requirements.txt               | 2 +-
 openstack_requirements/cmds/update.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/global-requirements.txt b/global-requirements.txt
index 28c547bb2b..e071955f90 100644
--- a/global-requirements.txt
+++ b/global-requirements.txt
@@ -109,7 +109,7 @@ Parsley
 passlib>=1.6
 Paste
 PasteDeploy>=1.5.0
-pbr>=1.6,<2.0
+pbr>=1.6
 pecan>=1.0.0
 pexpect>=3.1,!=3.3 # ISC License
 Pillow>=2.4.0 # MIT
diff --git a/openstack_requirements/cmds/update.py b/openstack_requirements/cmds/update.py
index 77a056a62a..d979aeafcf 100644
--- a/openstack_requirements/cmds/update.py
+++ b/openstack_requirements/cmds/update.py
@@ -62,7 +62,7 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.3'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)
 """