Updated from global requirements

Change-Id: I934f67643ed407ef3f12a9a2d0d9f695cb88038e

2 files changed, 19 insertions, 3 deletions

diff --git a/requirements.txt b/requirements.txt
index f91e2e0..ec661c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@ argparse
 cmd2>=0.6.7
 PrettyTable>=0.7,<0.8
 pyparsing>=2.0.1
-six>=1.4.1
-stevedore>=0.12
+six>=1.6.0
+stevedore>=0.14
diff --git a/setup.py b/setup.py
index 72b1f52..7363757 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,27 @@
 #!/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.
+
+# 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  # flake8: noqa
+    import multiprocessing  # noqa
 except ImportError:
     pass