summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt4
-rw-r--r--docs/releases/1.7.txt6
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 5c1b1cab6f..498f303daf 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -457,6 +457,10 @@ these changes.
* ``ModelAdmin.get_formsets`` will be removed.
+* Remove the backward compatible shims introduced to rename the
+ ``BaseMemcachedCache._get_memcache_timeout()`` method to
+ ``get_backend_timeout()``.
+
2.0
---
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 74fc74947c..a978bb8ac1 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -552,3 +552,9 @@ The :class:`django.db.models.IPAddressField` and
:class:`django.db.models.GenericIPAddressField` and
:class:`django.forms.GenericIPAddressField`.
+``BaseMemcachedCache._get_memcache_timeout`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``BaseMemcachedCache._get_memcache_timeout()`` method has been renamed to
+``get_backend_timeout()``. Despite being a private API, it will go through the
+normal deprecation.