Merge "Updated from global requirements"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2017年03月26日 03:15:44 +00:00

committed by Gerrit Code Review

parent 5145607196 bccfc3b69b

commit 2ef8b3aa59

2 changed files with 2 additions and 2 deletions

@@ -2,6 +2,6 @@

# of appearance. Changing the order has an impact on the overall integration

# process, which may cause wedges in the gate later.

pbr>=1.8 # Apache-2.0

pbr>=2.0.0 # Apache-2.0

diskimage-builder!=1.6.0,!=1.7.0,!=1.7.1,>=1.1.2 # Apache-2.0

@@ -25,5 +25,5 @@ except ImportError:

pass

setuptools.setup(

setup_requires=['pbr>=1.8'],

setup_requires=['pbr>=2.0.0'],

pbr=True)