- 1.1.14

(cherry picked from commit 4b22b01ade6f94cc4db2f2040c802067a25d29a4)

Change-Id: I520fbff300ae034166a2f80685e0831ff2d1929e

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index b4e3f5211755bf7304ae14c2233bea454540be85..da944f66006637709b9a2df9e8cbb58d0312056b 100644 (file)
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -20,7 +20,71 @@
 
 .. changelog::
     :version: 1.1.14
-    :include_notes_from: unreleased_11
+    :released: September 5, 2017
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4069
+        :versions: 1.2.0b3
+
+        Fixed bug in :meth:`.Session.merge` following along similar lines as that
+        of :ticket:`4030`, where an internal check for a target object in
+        the identity map could lead to an error if it were to be garbage collected
+        immediately before the merge routine actually retrieves the object.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4048
+        :versions: 1.2.0b3
+
+        Fixed bug where an :func:`.undefer_group` option would not be recognized
+        if it extended from a relationship that was loading using joined eager
+        loading.  Additionally, as the bug led to excess work being performed,
+        Python function call counts are also improved by 20% within the initial
+        calculation of result set columns, complementing the joined eager load
+        improvements of :ticket:`3915`.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4068
+
+        Fixed race condition in ORM identity map which would cause objects
+        to be inappropriately removed during a load operation, causing
+        duplicate object identities to occur, particularly under joined eager
+        loading which involves deduplication of objects.  The issue is specific
+        to garbage collection of weak references and is observed only under the
+        Pypy interpreter.
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4056
+        :versions: 1.2.0b3
+
+        Fixed bug in :meth:`.Session.merge` where objects in a collection that had
+        the primary key attribute set to ``None`` for a key that is  typically
+        autoincrementing would be considered to be a database-persisted key for
+        part of the internal deduplication process, causing only one object to
+        actually be inserted in the database.
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4053
+
+        Altered the range specification for window functions to allow
+        for two of the same PRECEDING or FOLLOWING keywords in a range
+        by allowing for the left side of the range to be positive
+        and for the right to be negative, e.g. (1, 3) is
+        "1 FOLLOWING AND 3 FOLLOWING".
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4067
+        :versions: 1.2.0b3
+
+        An :class:`.InvalidRequestError` is raised when a :func:`.synonym`
+        is used against an attribute that is not against a :class:`.MapperProperty`,
+        such as an association proxy.  Previously, a recursion overflow would
+        occur trying to locate non-existent attributes.
 
 .. changelog::
     :version: 1.1.13

diff --git a/doc/build/changelog/unreleased_11/4048.rst b/doc/build/changelog/unreleased_11/4048.rst
deleted file mode 100644 (file)
index 6127361..0000000
--- a/doc/build/changelog/unreleased_11/4048.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4048
-    :versions: 1.2.0b3
-
-    Fixed bug where an :func:`.undefer_group` option would not be recognized
-    if it extended from a relationship that was loading using joined eager
-    loading.  Additionally, as the bug led to excess work being performed,
-    Python function call counts are also improved by 20% within the initial
-    calculation of result set columns, complementing the joined eager load
-    improvements of :ticket:`3915`.

diff --git a/doc/build/changelog/unreleased_11/4053.rst b/doc/build/changelog/unreleased_11/4053.rst
deleted file mode 100644 (file)
index 63a6122..0000000
--- a/doc/build/changelog/unreleased_11/4053.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4053
-    :versions: 1.2.0b3
-
-    Altered the range specification for window functions to allow
-    for two of the same PRECEDING or FOLLOWING keywords in a range
-    by allowing for the left side of the range to be positive
-    and for the right to be negative, e.g. (1, 3) is
-    "1 FOLLOWING AND 3 FOLLOWING".

diff --git a/doc/build/changelog/unreleased_11/4056.rst b/doc/build/changelog/unreleased_11/4056.rst
deleted file mode 100644 (file)
index b8e02a0..0000000
--- a/doc/build/changelog/unreleased_11/4056.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4056
-    :versions: 1.2.0b3
-
-    Fixed bug in :meth:`.Session.merge` where objects in a collection that had
-    the primary key attribute set to ``None`` for a key that is  typically
-    autoincrementing would be considered to be a database-persisted key for
-    part of the internal deduplication process, causing only one object to
-    actually be inserted in the database.

diff --git a/doc/build/changelog/unreleased_11/4067.rst b/doc/build/changelog/unreleased_11/4067.rst
deleted file mode 100644 (file)
index 8fa8b92..0000000
--- a/doc/build/changelog/unreleased_11/4067.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4067
-    :versions: 1.2.0b3
-
-    An :class:`.InvalidRequestError` is raised when a :func:`.synonym`
-    is used against an attribute that is not against a :class:`.MapperProperty`,
-    such as an association proxy.  Previously, a recursion overflow would
-    occur trying to locate non-existent attributes.

diff --git a/doc/build/changelog/unreleased_11/4068.rst b/doc/build/changelog/unreleased_11/4068.rst
deleted file mode 100644 (file)
index 1bd5dd6..0000000
--- a/doc/build/changelog/unreleased_11/4068.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4068
-    :versions: 1.2.0b3
-
-    Fixed race condition in ORM identity map which would cause objects
-    to be inappropriately removed during a load operation, causing
-    duplicate object identities to occur, particularly under joined eager
-    loading which involves deduplication of objects.  The issue is specific
-    to garbage collection of weak references and is observed only under the
-    Pypy interpreter.
\ No newline at end of file

diff --git a/doc/build/changelog/unreleased_11/4069.rst b/doc/build/changelog/unreleased_11/4069.rst
deleted file mode 100644 (file)
index f14ec97..0000000
--- a/doc/build/changelog/unreleased_11/4069.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4069
-    :versions: 1.2.0b3
-    
-    Fixed bug in :meth:`.Session.merge` following along similar lines as that
-    of :ticket:`4030`, where an internal check for a target object in
-    the identity map could lead to an error if it were to be garbage collected
-    immediately before the merge routine actually retrieves the object.
\ No newline at end of file