From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 24 Jul 2017 21:18:33 +0000 (-0400)
Subject: - 1.1.12
X-Git-Tag: rel_1_1_12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad5626cdb9b4d4ac38b2169dc7377d4bc66ee549;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 1.1.12
---

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 629b8a4db6..de3b5827b8 100644
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -20,7 +20,51 @@
 
 .. changelog::
     :version: 1.1.12
-    :include_notes_from: unreleased_11
+    :released: July 24, 2017
+
+    .. change:: cache_order_sequence
+        :tags: feature, oracle, posgresql
+        :versions: 1.2.0b1
+
+        Added new keywords :paramref:`.Sequence.cache` and
+        :paramref:`.Sequence.order` to :class:`.Sequence`, to allow rendering
+        of the CACHE parameter understood by Oracle and PostgreSQL, and the
+        ORDER parameter understood by Oracle.  Pull request
+        courtesy David Moore.
+
+
+    .. change:: 4033
+        :tags: bug, orm
+        :tickets: 4033
+        :versions: 1.2.0b2
+
+        Fixed regression from 1.1.11 where adding additional non-entity
+        columns to a query that includes an entity with subqueryload
+        relationships would fail, due to an inspection added in 1.1.11 as a
+        result of :ticket:`4011`.
+
+
+    .. change:: 4031
+        :tags: bug, orm
+        :versions: 1.2.0b2
+        :tickets: 4031
+
+        Fixed bug involving JSON NULL evaluation logic added in 1.1 as part
+        of :ticket:`3514` where the logic would not accommodate ORM
+        mapped attributes named differently from the :class:`.Column`
+        that was mapped.
+
+    .. change:: 4030
+        :tags: bug, orm
+        :versions: 1.2.0b2
+        :tickets: 4030
+
+        Added ``KeyError`` checks to all methods within
+        :class:`.WeakInstanceDict` where a check for ``key in dict`` is
+        followed by indexed access to that key, to guard against a race against
+        garbage collection that under load can remove the key from the dict
+        after the code assumes its present, leading to very infrequent
+        ``KeyError`` raises.
 
 .. changelog::
     :version: 1.1.11
diff --git a/doc/build/changelog/unreleased_11/4030.rst b/doc/build/changelog/unreleased_11/4030.rst
deleted file mode 100644
index 8379952cfb..0000000000
--- a/doc/build/changelog/unreleased_11/4030.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. change:: 4030
-    :tags: bug, orm
-    :versions: 1.2.0b2
-    :tickets: 4030
-
-    Added ``KeyError`` checks to all methods within
-    :class:`.WeakInstanceDict` where a check for ``key in dict`` is
-    followed by indexed access to that key, to guard against a race against
-    garbage collection that under load can remove the key from the dict
-    after the code assumes its present, leading to very infrequent
-    ``KeyError`` raises.
diff --git a/doc/build/changelog/unreleased_11/4031.rst b/doc/build/changelog/unreleased_11/4031.rst
deleted file mode 100644
index 57aa455944..0000000000
--- a/doc/build/changelog/unreleased_11/4031.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change:: 4031
-    :tags: bug, orm
-    :versions: 1.2.0b2
-    :tickets: 4031
-
-    Fixed bug involving JSON NULL evaluation logic added in 1.1 as part
-    of :ticket:`3514` where the logic would not accommodate ORM
-    mapped attributes named differently from the :class:`.Column`
-    that was mapped.
diff --git a/doc/build/changelog/unreleased_11/4033.rst b/doc/build/changelog/unreleased_11/4033.rst
deleted file mode 100644
index 36854ad837..0000000000
--- a/doc/build/changelog/unreleased_11/4033.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change:: 4033
-    :tags: bug, orm
-    :tickets: 4033
-    :versions: 1.2.0b2
-
-    Fixed regression from 1.1.11 where adding additional non-entity
-    columns to a query that includes an entity with subqueryload
-    relationships would fail, due to an inspection added in 1.1.11 as a
-    result of :ticket:`4011`.
-
diff --git a/doc/build/changelog/unreleased_11/cache_order_sequence.rst b/doc/build/changelog/unreleased_11/cache_order_sequence.rst
deleted file mode 100644
index 2ba7146717..0000000000
--- a/doc/build/changelog/unreleased_11/cache_order_sequence.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. change:: cache_order_sequence
-    :tags: feature, oracle, posgresql
-    :versions: 1.2.0b1
-
-    Added new keywords :paramref:`.Sequence.cache` and
-    :paramref:`.Sequence.order` to :class:`.Sequence`, to allow rendering
-    of the CACHE parameter understood by Oracle and PostgreSQL, and the
-    ORDER parameter understood by Oracle.  Pull request
-    courtesy David Moore.
-
diff --git a/doc/build/conf.py b/doc/build/conf.py
index 64fe3f37b7..f8dd56ac93 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -110,9 +110,9 @@ copyright = u'2007-2017, the SQLAlchemy authors and contributors'
 # The short X.Y version.
 version = "1.1"
 # The full version, including alpha/beta/rc tags.
-release = "1.1.11"
+release = "1.1.12"
 
-release_date = "June 19, 2017"
+release_date = "July 24, 2017"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"