From 32fe6e14c9f879a070c994b3e4741fe930c00f3b Mon Sep 17 00:00:00 2001
From: OpenStack Jenkins <jenkins@openstack.org>
Date: Sat, 29 Mar 2014 01:31:59 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I835e8f7438bdaab718e0a9910880819cab961936
---
 requirements.txt | 13 ++++++-------
 setup.py         | 38 ++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7eae0c0c6..ab13e7701 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,10 @@
-requests==2.0.0
-stevedore==0.14
-ordereddict>=1.1
+requests>=1.1
+stevedore>=0.14
+ordereddict
 -e git+https://github.com/jimrollenhagen/pecan@7c8db9bca2daf33a4616f0308db75a0c0d55d015#egg=pecan
 WSME>=0.6
 six>=1.5.2
-oslo.config==1.2.1
-Babel==1.3
-iso8601==0.1.10
 eventlet>=0.13.0
-
+oslo.config>=1.2.0
+Babel>=1.3
+iso8601>=0.1.9
diff --git a/setup.py b/setup.py
index 6f5f79405..70c2b3f32 100644
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,22 @@
 #!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# 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
+#
+#    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 WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-"""
-Copyright 2013 Rackspace, Inc.
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
+import setuptools
 
-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
-
-   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 WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-"""
-
-from setuptools import setup
-
-setup(
+setuptools.setup(
     setup_requires=['pbr'],
-    pbr=True,
-)
+    pbr=True)