From dc112bf530fe2fc3b9be82bb7a6e3213c5f7fc11 Mon Sep 17 00:00:00 2001
From: Daniel Tao <daniel.tao@gmail.com>
Date: Fri, 15 Sep 2017 16:16:44 -0500
Subject: [2.0.x] Fixed #28601 -- Prevented cache.get_or_set() from caching
 None if default is a callable that returns None.

Backport of 4d60261b2a77460b4c127c3d832518b95e11a0ac from master
---
 docs/releases/1.11.7.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/releases/1.11.7.txt b/docs/releases/1.11.7.txt
index 41d144e742..61f0d6d012 100644
--- a/docs/releases/1.11.7.txt
+++ b/docs/releases/1.11.7.txt
@@ -9,4 +9,5 @@ Django 1.11.7 fixes several bugs in 1.11.6.
 Bugfixes
 ========
 
-* ...
+* Prevented ``cache.get_or_set()`` from caching ``None`` if the ``default``
+  argument is a callable that returns ``None`` (:ticket:`28601`).
-- 
cgit v1.3