From f9a08eb8975d8a49bee8cc42ae207100adb6ce75 Mon Sep 17 00:00:00 2001
From: Ian Foote <python@ian.feete.org>
Date: Fri, 6 Nov 2015 20:18:00 +0100
Subject: [1.9.x] Fixed #25693 -- Prevented data loss with Prefetch and
 ManyToManyField.

Thanks to Jamie Matthews for finding and explaining the bug.

Backport of 4608573788c04fc047da42b4b7b48fdee8136ad3 from master
---
 docs/releases/1.7.11.txt | 13 +++++++++++++
 docs/releases/1.8.7.txt  |  3 +++
 docs/releases/index.txt  |  1 +
 3 files changed, 17 insertions(+)
 create mode 100644 docs/releases/1.7.11.txt

(limited to 'docs')

diff --git a/docs/releases/1.7.11.txt b/docs/releases/1.7.11.txt
new file mode 100644
index 0000000000..7c6153eab1
--- /dev/null
+++ b/docs/releases/1.7.11.txt
@@ -0,0 +1,13 @@
+===========================
+Django 1.7.11 release notes
+===========================
+
+*Under development*
+
+Django 1.7.11 fixes a data loss bug in 1.7.10.
+
+Bugfixes
+========
+
+* Fixed a data loss possibility with :class:`~django.db.models.Prefetch` if
+  ``to_attr`` is set to a ``ManyToManyField`` (:ticket:`25693`).
diff --git a/docs/releases/1.8.7.txt b/docs/releases/1.8.7.txt
index 78912d0f52..6fb45803ac 100644
--- a/docs/releases/1.8.7.txt
+++ b/docs/releases/1.8.7.txt
@@ -21,3 +21,6 @@ Bugfixes
 
 * Fixed a regression in 1.8.6 that caused an application with South migrations
   in the ``migrations`` directory to fail (:ticket:`25618`).
+
+* Fixed a data loss possibility with :class:`~django.db.models.Prefetch` if
+  ``to_attr`` is set to a ``ManyToManyField`` (:ticket:`25693`).
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index bd71d18092..2251a51ac6 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -46,6 +46,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   1.7.11
    1.7.10
    1.7.9
    1.7.8
-- 
cgit v1.3