Merge "Removed swiftclient from dependencies"

doc/source/conf.py

@@ -240,5 +240,4 @@ latex_documents = [
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
-                       'swift': ('http://swift.openstack.org', None)}
+intersphinx_mapping = {'python': ('http://docs.python.org/', None), }

doc/source/man/manila-manage.rst

@@ -270,7 +270,6 @@ SEE ALSO
 ========
 
 * `OpenStack Manila <http://manila.openstack.org>`__
-* `OpenStack Swift <http://swift.openstack.org>`__
 
 BUGS
 ====

manila/exception.py

@@ -489,10 +489,6 @@ class InvalidShareSnapshot(ManilaException):
     message = _("Invalid share snapshot: %(reason)s")
 
 
-class SwiftConnectionFailed(ManilaException):
-    message = _("Connection to swift failed") + ": %(reason)s"
-
-
 class ShareMetadataNotFound(NotFound):
     message = _("Metadata item is not found")
 

requirements.txt

@@ -16,7 +16,6 @@ PasteDeploy>=1.5.0
 python-neutronclient>=2.3.0,<3
 python-glanceclient>=0.9.0
 python-keystoneclient>=0.3.2
-python-swiftclient>=1.5
 Routes>=1.12.3
 SQLAlchemy>=0.7.8,<=0.7.99
 sqlalchemy-migrate>=0.7.2