Merge remote-tracking branch 'origin/master' into merge-branchfeature/keystoneauth_integration

Conflicts:
	keystoneclient/exceptions.py
	keystoneclient/fixture/discovery.py
	keystoneclient/fixture/v2.py
	keystoneclient/fixture/v3.py
	keystoneclient/middleware/auth_token.py
	keystoneclient/middleware/s3_token.py
	keystoneclient/tests/unit/test_auth_token_middleware.py
	keystoneclient/tests/unit/test_memcache_crypt.py
	keystoneclient/tests/unit/test_s3_token_middleware.py
	requirements.txt
	test-requirements.txt

Change-Id: Ib51acebaac7966bf37c1562fa15b9061df6a7aa5

1 files changed, 16 insertions, 4 deletions

diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py
index 40fd85d..ff0db6d 100644
--- a/keystoneclient/discover.py
+++ b/keystoneclient/discover.py
@@ -12,6 +12,7 @@
 
 import logging
 
+from debtcollector import removals
 import six
 
 from keystoneclient import _discover
@@ -165,14 +166,19 @@ class Discover(_discover.Discover):
         super(Discover, self).__init__(session, url,
                                        authenticated=authenticated)
 
+    @removals.remove(message='Use raw_version_data instead.', version='1.7.0',
+                     removal_version='2.0.0')
     def available_versions(self, **kwargs):
         """Return a list of identity APIs available on the server and the data
         associated with them.
 
-        DEPRECATED: use raw_version_data()
+        .. warning::
+
+            This method is deprecated as of the 1.7.0 release in favor of
+            :meth:`raw_version_data` and may be removed in the 2.0.0 release.
 
         :param bool unstable: Accept endpoints not marked 'stable'. (optional)
-                              DEPRECTED. Equates to setting allow_experimental
+                              Equates to setting allow_experimental
                               and allow_unknown to True.
         :param bool allow_experimental: Allow experimental version endpoints.
         :param bool allow_deprecated: Allow deprecated version endpoints.
@@ -185,6 +191,10 @@ class Discover(_discover.Discover):
         """
         return self.raw_version_data(**kwargs)
 
+    @removals.removed_kwarg(
+        'unstable',
+        message='Use allow_experimental and allow_unknown instead.',
+        version='1.7.0', removal_version='2.0.0')
     def raw_version_data(self, unstable=False, **kwargs):
         """Get raw version information from URL.
 
@@ -192,8 +202,10 @@ class Discover(_discover.Discover):
         on the data, so what is returned here will be the data in the same
         format it was received from the endpoint.
 
-        :param bool unstable: (deprecated) equates to setting
-                              allow_experimental and allow_unknown.
+        :param bool unstable: equates to setting allow_experimental and
+                              allow_unknown. This argument is deprecated as of
+                              the 1.7.0 release and may be removed in the 2.0.0
+                              release.
         :param bool allow_experimental: Allow experimental version endpoints.
         :param bool allow_deprecated: Allow deprecated version endpoints.
         :param bool allow_unknown: Allow endpoints with an unrecognised status.