From 423b3afce431fd0a1d683bca9b2b80a1c4e3c8ca Mon Sep 17 00:00:00 2001
From: Ed Bartosh <eduard.bartosh@intel.com>
Date: Wed, 9 Dec 2015 14:18:44 +0200
Subject: Fixed #25939 -- Removed redundant transaction in
 QuerySet.update_or_create().

There is no need to wrap the save() call in transaction.atomic() as
it's already done down the call stack in Model.save_base().
---
 docs/releases/1.10.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index 853955f936..10a517f82d 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -363,6 +363,10 @@ Miscellaneous
   :class:`~django.http.HttpResponse` are now closed immediately instead of when
   the WSGI server calls ``close()`` on the response.
 
+* A redundant ``transaction.atomic()`` call in ``QuerySet.update_or_create()``
+  is removed. This may affect query counts tested by
+  ``TransactionTestCase.assertNumQueries()``.
+
 .. _deprecated-features-1.10:
 
 Features deprecated in 1.10
-- 
cgit v1.3