Updated from global requirements

Change-Id: If99b11499a780f8beb81305f8c49753715a213e9

manila/share/drivers/netapp/api.py

@@ -1,3 +1,17 @@
+# Copyright 2012 NetApp
+# All Rights Reserved.
+#
+#    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.
 import suds
 from suds.sax import text
 

requirements.txt

@@ -1,26 +1,26 @@
 pbr>=0.5.21,<1.0
 amqplib>=0.6.1
-anyjson>=0.2.4
+anyjson>=0.3.3
 argparse
-babel>=0.9.6
+Babel>=1.3
 eventlet>=0.13.0
-greenlet>=0.3.1
+greenlet>=0.3.2
-iso8601>=0.1.4
+iso8601>=0.1.8
-kombu>=1.0.4
+kombu>=2.4.8
 lockfile>=0.8
 lxml>=2.3
-oslo.config>=1.1.0
+oslo.config>=1.2.0
 paramiko>=1.8.0
-paste
+Paste
-pastedeploy>=1.5.0
+PasteDeploy>=1.5.0
 python-neutronclient>=2.3.0,<3
-python-glanceclient>=0.5.0,<2
+python-glanceclient>=0.9.0
-python-keystoneclient>=0.3.0
+python-keystoneclient>=0.3.2
-python-swiftclient>=1.2,<2
+python-swiftclient>=1.5
-routes>=1.12.3
+Routes>=1.12.3
-sqlalchemy>=0.7,<=0.7.99
+SQLAlchemy>=0.7.8,<=0.7.99
-sqlalchemy-migrate>=0.7
+sqlalchemy-migrate>=0.7.2
-stevedore>=0.7
+stevedore>=0.10
 suds>=0.4
-webob>=1.0.8
+WebOb>=1.2.3,<1.3
 wsgiref>=0.1.2

setup.py

@@ -14,6 +14,7 @@
 # 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(

test-requirements.txt

@@ -1,18 +1,17 @@
 # Install bounded pep8/pyflakes first, then let flake8 install
 pep8==1.4.5
-pyflakes==0.7.2
+pyflakes>=0.7.2,<0.7.4
 flake8==2.0
-hacking>=0.5.3,<0.6
+hacking>=0.5.6,<0.8
 
 coverage>=3.6
-distribute>=0.6.24
+hp3parclient>=2.0,<3.0
-hp3parclient>=1.0.0
+mock>=1.0
-mock>=0.8.0
 mox>=0.5.3
-mysql-python
+MySQL-python
 nose
 nosehtmloutput>=0.0.3
 nosexcover
 openstack.nose_plugin>=0.7
 psycopg2
-sphinx>=1.1.2
+sphinx>=1.1.2,<1.2