From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 21 Apr 2013 15:47:43 +0000 (-0400)
Subject: - identify [ticket:2710] as a regression from [ticket:2229], doesn't
X-Git-Tag: rel_0_8_1~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ab6d4107a7204fae2c4887c0c05c447a38a5db;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- identify [ticket:2710] as a regression from [ticket:2229], doesn't
need to be in 0.7.
---

diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst
index 08f5cd94c6..c650e769f5 100644
--- a/doc/build/changelog/changelog_07.rst
+++ b/doc/build/changelog/changelog_07.rst
@@ -6,14 +6,6 @@
 .. changelog::
     :version: 0.7.11
 
-    .. change::
-      :tags: bug, orm
-      :tickets: 2710
-
-      Fixed bug where many-to-many relationship with uselist=False
-      would fail to delete the association row and raise an error
-      if the scalar attribute were set to None.
-
     .. change::
       :tags: bug, orm
       :tickets: 2699
diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index eab1c2f9e2..175eae66c4 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -12,7 +12,8 @@
 
       Fixed bug where many-to-many relationship with uselist=False
       would fail to delete the association row and raise an error
-      if the scalar attribute were set to None.  Also in 0.7.11.
+      if the scalar attribute were set to None.  This was a
+      regression introduced by the changes for :ticket:`2229`.
 
     .. change::
       :tags: bug, orm