- changelog for #3262, fixes #3262

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index a6a935da48f94382d3d17beec98521a3a3745011..18043c4567fe68e0f455f17c7e84965567d3b74e 100644 (file)
--- 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