Restore missing changelog files for #4128

The fix merged in 4a31c30fa5ebd6af0e72937b21b2e5ee79e12631
failed to get backported to 1.2 and the changelog files
got blown away in the release process.  Restore the
changelog files to master before cherry-picking
the whole thing to 1.2.

Change-Id: I899808734458e25a023142c2c5bb37cbed869479
Fixes: #4128

diff --git a/doc/build/changelog/unreleased_12/4128.rst b/doc/build/changelog/unreleased_12/4128.rst
new file mode 100644 (file)
index 0000000..908bd11
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/4128.rst
@@ -0,0 +1,16 @@
+.. change::
+    :tags: bug, orm
+    :tickets: 4128
+
+    Fixed a long-standing regression that occurred in version
+    1.0, which prevented the use of a custom :class:`.MapperOption`
+    that alters the _params of a :class:`.Query` object for a
+    lazy load, since the lazy loader itself would overwrite those
+    parameters.   This applies to the "temporal range" example
+    on the wiki.  Note however that the
+    :meth:`.Query.populate_existing` method is now required in
+    order to rewrite the mapper options associated with an object
+    already loaded in the identity map.  Also, a custom defined
+    :class:`.MapperOption` will now cause lazy loaders related to
+    the target object to use a non-baked query by default unless
+    the :meth:`.MapperOption._generate_cache_key` method is implemented.

diff --git a/doc/build/changelog/unreleased_12/post_criteria_subqueryload.rst b/doc/build/changelog/unreleased_12/post_criteria_subqueryload.rst
new file mode 100644 (file)
index 0000000..2b8942f
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/post_criteria_subqueryload.rst
@@ -0,0 +1,8 @@
+.. change::
+    :tags: bug, orm
+
+    Fixed bug where the new :meth:`.baked.Result.with_post_criteria`
+    method would not interact with a subquery-eager loader correctly,
+    in that the "post criteria" would not be applied to embedded
+    subquery eager loaders.   This is related to :ticket:`4128` in that
+    the post criteria feature is now used by the lazy loader.