summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Sanders <michael.sanders@arm.com>2018-08-01 10:52:28 +0100
committerTim Graham <timograham@gmail.com>2018-08-02 17:17:12 -0400
commit221ef69a9b89262456bb7abe0e5a4b2fda4a0695 (patch)
tree4b396a451cdc6e15d90bb329fdaad29e0699ae15 /docs
parentadfd2614045518cc9221aef1f17fd3ffeac3d2cc (diff)
[2.1.x] Fixed #29499 -- Fixed race condition in QuerySet.update_or_create().
A race condition happened when the object didn't already exist and another process/thread created the object before update_or_create() did and then attempted to update the object, also before update_or_create() saved the object. The update by the other process/thread could be lost. Backport of 271542dad1686c438f658aa6220982495db09797 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.16.txt13
-rw-r--r--docs/releases/2.0.9.txt13
-rw-r--r--docs/releases/2.1.1.txt3
-rw-r--r--docs/releases/index.txt2
4 files changed, 30 insertions, 1 deletions
diff --git a/docs/releases/1.11.16.txt b/docs/releases/1.11.16.txt
new file mode 100644
index 0000000000..04335f9439
--- /dev/null
+++ b/docs/releases/1.11.16.txt
@@ -0,0 +1,13 @@
+============================
+Django 1.11.16 release notes
+============================
+
+*Expected September 1, 2018*
+
+Django 1.11.16 fixes a data loss bug in 1.11.15.
+
+Bugfixes
+========
+
+* Fixed a race condition in ``QuerySet.update_or_create()`` that could result
+ in data loss (:ticket:`29499`).
diff --git a/docs/releases/2.0.9.txt b/docs/releases/2.0.9.txt
new file mode 100644
index 0000000000..2def94ef73
--- /dev/null
+++ b/docs/releases/2.0.9.txt
@@ -0,0 +1,13 @@
+==========================
+Django 2.0.9 release notes
+==========================
+
+*Expected September 1, 2018*
+
+Django 2.0.9 fixes a data loss bug in 2.0.8.
+
+Bugfixes
+========
+
+* Fixed a race condition in ``QuerySet.update_or_create()`` that could result
+ in data loss (:ticket:`29499`).
diff --git a/docs/releases/2.1.1.txt b/docs/releases/2.1.1.txt
index 42fe6edeb3..dd9662118d 100644
--- a/docs/releases/2.1.1.txt
+++ b/docs/releases/2.1.1.txt
@@ -9,4 +9,5 @@ Django 2.1.1 fixes several bugs in 2.1.
Bugfixes
========
-* ...
+* Fixed a race condition in ``QuerySet.update_or_create()`` that could result
+ in data loss (:ticket:`29499`).
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 364fc7f3d1..1f9a4ecd58 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -33,6 +33,7 @@ versions of the documentation contain the release notes for any later releases.
.. toctree::
:maxdepth: 1
+ 2.0.9
2.0.8
2.0.7
2.0.6
@@ -48,6 +49,7 @@ versions of the documentation contain the release notes for any later releases.
.. toctree::
:maxdepth: 1
+ 1.11.16
1.11.15
1.11.14
1.11.13