summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.12.txt4
-rw-r--r--docs/releases/2.0.4.txt4
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/releases/1.11.12.txt b/docs/releases/1.11.12.txt
index aa0035a3c3..64130c065e 100644
--- a/docs/releases/1.11.12.txt
+++ b/docs/releases/1.11.12.txt
@@ -9,4 +9,6 @@ Django 1.11.12 fixes a bug in 1.11.11.
Bugfixes
========
-* ...
+* Fixed a regression in Django 1.11.8 where combining two annotated
+ ``values_list()`` querysets with ``union()``, ``difference()``, or
+ ``intersection()`` crashed due to mismatching columns (:ticket:`29229`).
diff --git a/docs/releases/2.0.4.txt b/docs/releases/2.0.4.txt
index 0c4a9aff5a..d27ccf98bc 100644
--- a/docs/releases/2.0.4.txt
+++ b/docs/releases/2.0.4.txt
@@ -21,3 +21,7 @@ Bugfixes
* Fixed ``PasswordResetConfirmView`` crash when using a user model with a
``UUIDField`` primary key and the reset URL contains an encoded primary key
value that decodes to an invalid UUID (:ticket:`29206`).
+
+* Fixed a regression in Django 1.11.8 where combining two annotated
+ ``values_list()`` querysets with ``union()``, ``difference()``, or
+ ``intersection()`` crashed due to mismatching columns (:ticket:`29229`).