summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-16 12:58:05 +0200
committerCarlton Gibson <carlton@noumenal.es>2019-10-16 18:40:48 +0200
commit187a64608d2a207dfc12fdd6816526e9550069b7 (patch)
tree4a2b41185ce751af75dd94bcdeacbbec65f7bc41 /docs
parent1c5ec221a44fc9ce1585fc1f94830957df4322e7 (diff)
Fixed #30885 -- Dropped support for MariaDB 10.1.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/databases.txt2
-rw-r--r--docs/releases/3.1.txt6
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 3b23a9dd51..1667e911e2 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -286,7 +286,7 @@ MariaDB notes
.. versionadded:: 3.0
-Django supports MariaDB 10.1 and higher.
+Django supports MariaDB 10.2 and higher.
To use MariaDB, use the MySQL backend, which is shared between the two. See the
:ref:`MySQL notes <mysql-notes>` for more details.
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index a92c18fc78..1077fcb921 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -224,6 +224,12 @@ backends.
* ``DatabaseOperations.fetch_returned_insert_columns()`` now requires an
additional ``returning_params`` argument.
+Dropped support for MariaDB 10.1
+--------------------------------
+
+Upstream support for MariaDB 10.1 ends in October 2020. Django 3.1 supports
+MariaDB 10.2 and higher.
+
Miscellaneous
-------------