From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 26 Jan 2015 22:04:40 +0000 (-0500)
Subject: - changelog for #3262, fixes #3262
X-Git-Tag: rel_1_0_0b1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=987f40b5aa325fe8a6655bcb0be2329c0a24025d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- changelog for #3262, fixes #3262
---

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index a6a935da48..18043c4567 100644
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -22,6 +22,17 @@
     series as well.  For changes that are specific to 1.0 with an emphasis
     on compatibility concerns, see :doc:`/changelog/migration_10`.
 
+    .. change::
+        :tags: feature, orm
+        :tickets: 3262
+        :pullreq: bitbucket:38
+
+        A warning is emitted when the same polymorphic identity is assigned
+        to two different mappers in the same hierarchy.  This is typically a
+        user error and means that the two different mapping types cannot be
+        correctly distinguished at load time.  Pull request courtesy
+        Sebastian Bank.
+
     .. change::
         :tags: feature, sql
         :pullreq: github:150