summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorvarunnaganathan <varunnaganathan912@gmail.com>2015-12-24 21:12:49 +0530
committerTim Graham <timograham@gmail.com>2016-01-02 07:06:54 -0500
commit3eba9638ee69138c73efb1d1c1d1b806ddafc6cf (patch)
treedd79667757cbb670e24d1fa8aa25f3e9bbf49648 /docs
parentf0ad641628a3ddc4e1c208e481b9cd0e9304dc3d (diff)
Fixed #25316 -- Fixed a crash with order_by() and values() after annotate().
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.8.8.txt4
-rw-r--r--docs/releases/1.9.1.txt4
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/releases/1.8.8.txt b/docs/releases/1.8.8.txt
index a888925841..2a8dc5792d 100644
--- a/docs/releases/1.8.8.txt
+++ b/docs/releases/1.8.8.txt
@@ -54,3 +54,7 @@ Bugfixes
* Made ``loaddata`` skip disabling and enabling database constraints when it
doesn't load any fixtures (:ticket:`23372`).
+
+* Fixed a crash in ``QuerySet.values()/values_list()`` after an ``annotate()``
+ and ``order_by()`` when ``values()/values_list()`` includes a field not in
+ the ``order_by()`` (:ticket:`25316`).
diff --git a/docs/releases/1.9.1.txt b/docs/releases/1.9.1.txt
index 46e4f25807..b8980e0dd2 100644
--- a/docs/releases/1.9.1.txt
+++ b/docs/releases/1.9.1.txt
@@ -79,3 +79,7 @@ Bugfixes
* Restored ``contrib.auth`` hashers compatibility with py-bcrypt
(:ticket:`26016`).
+
+* Fixed a crash in ``QuerySet.values()/values_list()`` after an ``annotate()``
+ and ``order_by()`` when ``values()/values_list()`` includes a field not in
+ the ``order_by()`` (:ticket:`25316`).