Update to PBR 0.5.21+

Change-Id: Icb0754f9d64ea2b4d561866c8c5f614316217a1b

requirements.txt

@@ -1,8 +1,7 @@
 cliff>=1.4
-d2to1>=0.2.10,<0.3
 jsonschema>=1.0.0,!=1.4.0,<2
 keyring
-pbr>=0.5.16,<0.6
+pbr>=0.5.21,<1.0
 python-keystoneclient>=0.2,<0.3
 requests>=1.1,<1.2.1
 stevedore>=0.9

setup.py

@@ -1,21 +1,22 @@
 #!/usr/bin/env python
-# Copyright 2012 Managed I.T.
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-# Author: Kiall Mac Innes <kiall@managedit.ie>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    http://www.apache.org/licenses/LICENSE-2.0
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# distributed under the License is distributed on an "AS IS" BASIS,
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# License for the specific language governing permissions and limitations
+# implied.
-# under the License.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
 setuptools.setup(
-    setup_requires=['d2to1', 'pbr'],
+    setup_requires=['pbr>=0.5.21,<1.0'],
-    d2to1=True)
+    pbr=True)

test-requirements.txt

@@ -1,4 +1,5 @@
 coverage>=3.6
+discover
 flake8==2.0
 hacking>=0.5.3,<0.6
 mox>=0.5.3