From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 17 Mar 2011 20:59:51 +0000 (-0400)
Subject: changelog update with 0.6 message
X-Git-Tag: rel_0_7b3~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e9f0b5c79e7737125a8e304d9ba432114cec6e5;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

changelog update with 0.6 message
---

diff --git a/CHANGES b/CHANGES
index 96c5b3bd99..c7e872340b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -469,6 +469,12 @@ CHANGES
     in the session.  This will be an exception in 0.7.
     [ticket:2046]
 
+  - Fixed bug in query.options() whereby a path 
+    applied to a lazyload using string keys could 
+    overlap a same named attribute on the wrong 
+    entity.  Note 0.7 has an updated version of this
+    fix.  [ticket:2098]
+
 - sql
   - Column.copy(), as used in table.tometadata(), copies the 
     'doc' attribute.  [ticket:2028]