summaryrefslogtreecommitdiff
path: root/docs/internals
diff options
context:
space:
mode:
authorJosh Smeaton <josh.smeaton@gmail.com>2013-12-26 00:13:18 +1100
committerMarc Tamlyn <marc.tamlyn@gmail.com>2014-11-15 14:00:43 +0000
commitf59fd15c4928caf3dfcbd50f6ab47be409a43b01 (patch)
treefe4a04d98359e1ffcbfe991303eb97d9a8e16afc /docs/internals
parent39e3ef88c237e3f4cedc89cd36494a6d3f490812 (diff)
Fixed #14030 -- Allowed annotations to accept all expressions
Diffstat (limited to 'docs/internals')
-rw-r--r--docs/internals/deprecation.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 57334840d4..0bba849713 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -41,6 +41,17 @@ details on these changes.
:class:`~django.core.management.BaseCommand` instead, which takes no arguments
by default.
+* ``django.db.models.sql.aggregates`` module will be removed.
+
+* ``django.contrib.gis.db.models.sql.aggregates`` module will be removed.
+
+* The following methods and properties of ``django.db.sql.query.Query`` will
+ be removed:
+
+ * Properties: ``aggregates`` and ``aggregate_select``
+ * Methods: ``add_aggregate``, ``set_aggregate_mask``, and
+ ``append_aggregate_mask``.
+
* ``django.template.resolve_variable`` will be removed.
* The ``error_message`` argument of ``django.forms.RegexField`` will be removed.