From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 24 Jul 2014 18:04:23 +0000 (-0400)
Subject: merge 0.9.8 start
X-Git-Tag: rel_1_0_0b1~288
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07c01b77f16a08cecdad2c80c1283bed46a7f815;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge 0.9.8 start
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index b35d40b8e3..3ec09076bc 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -10,6 +10,9 @@
     .. include:: changelog_07.rst
         :start-line: 5
 
+.. changelog::
+    :version: 0.9.8
+
 .. changelog::
     :version: 0.9.7
     :released: July 22, 2014
@@ -359,12 +362,10 @@
         In this situation, a many-to-one relationship set to None, or
         in some cases a scalar attribute set to None, may not be detected
         as a net change in value, and therefore the UPDATE would not reset
-        what was on the previous row.
-
-        The fix here takes on a different form in 1.0.0 vs. 0.9.5.
-        In 1.0.0, the issue is ultimately resolved by :ticket:`3061`,
-        which reverts the more patchwork version of the fix as it exists
-        in 0.9.5.
+        what was on the previous row.   This is due to some as-yet
+        unresovled side effects of the way attribute history works in terms
+        of implicitly assuming None isn't really a "change" for a previously
+        un-set attribute.  See also :ticket:`3061`.
 
         .. note::