- 1.2.2

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 419747d4512e6ed351255bbf34aac3fcf2551600..b6380b44dd3078fde9c9f2d45784044761192754 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,41 @@
 
 .. changelog::
     :version: 1.2.2
-    :include_notes_from: unreleased_12
+    :released: January 24, 2018
+
+    .. change::
+        :tags: bug, mssql
+        :tickets: 4164
+
+        Added ODBC error code 10054 to the list of error
+        codes that count as a disconnect for ODBC / MSSQL server.
+
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4171
+
+        Fixed 1.2 regression regarding new bulk_replace event
+        where a backref would fail to remove an object from the
+        previous owner when a bulk-assignment assigned the
+        object to a new owner.
+
+    .. change::
+        :tags: bug, oracle
+        :tickets: 4163
+
+        The cx_Oracle dialect now calls setinputsizes() with cx_Oracle.NCHAR
+        unconditionally when the NVARCHAR2 datatype, in SQLAlchemy corresponding
+        to sqltypes.Unicode(), is in use.  Per cx_Oracle's author this allows
+        the correct conversions to occur within the Oracle client regardless
+        of the setting for NLS_NCHAR_CHARACTERSET.
+
+    .. change::
+        :tags: bug, mysql
+
+        Added more MySQL 8.0 reserved words to the MySQL dialect
+        for quoting purposes.  Pull request courtesy
+        Riccardo Magliocchetti.
 
 .. changelog::
     :version: 1.2.1

diff --git a/doc/build/changelog/unreleased_12/4163.rst b/doc/build/changelog/unreleased_12/4163.rst
deleted file mode 100644 (file)
index fad9bc7..0000000
--- a/doc/build/changelog/unreleased_12/4163.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, oracle
-    :tickets: 4163
-
-    The cx_Oracle dialect now calls setinputsizes() with cx_Oracle.NCHAR
-    unconditionally when the NVARCHAR2 datatype, in SQLAlchemy corresponding
-    to sqltypes.Unicode(), is in use.  Per cx_Oracle's author this allows
-    the correct conversions to occur within the Oracle client regardless
-    of the setting for NLS_NCHAR_CHARACTERSET.

diff --git a/doc/build/changelog/unreleased_12/4164.rst b/doc/build/changelog/unreleased_12/4164.rst
deleted file mode 100644 (file)
index 7ea69df..0000000
--- a/doc/build/changelog/unreleased_12/4164.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, mssql
-    :tickets: 4164
-
-    Added ODBC error code 10054 to the list of error
-    codes that count as a disconnect for ODBC / MSSQL server.
-

diff --git a/doc/build/changelog/unreleased_12/4171.rst b/doc/build/changelog/unreleased_12/4171.rst
deleted file mode 100644 (file)
index 69a31b9..0000000
--- a/doc/build/changelog/unreleased_12/4171.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4171
-
-    Fixed 1.2 regression regarding new bulk_replace event
-    where a backref would fail to remove an object from the
-    previous owner when a bulk-assignment assigned the
-    object to a new owner.

diff --git a/doc/build/changelog/unreleased_12/mysql_res.rst b/doc/build/changelog/unreleased_12/mysql_res.rst
deleted file mode 100644 (file)
index b6d72f9..0000000
--- a/doc/build/changelog/unreleased_12/mysql_res.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-.. change::
-    :tags: bug, mysql
-
-    Added more MySQL 8.0 reserved words to the MySQL dialect
-    for quoting purposes.  Pull request courtesy
-    Riccardo Magliocchetti.

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 8c2ed5f15bfbd1e7ce7401a2f66037dad6967c0b..ab72423913d09766145d3999b3612f9faba3e0f9 100644 (file)
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -110,9 +110,9 @@ copyright = u'2007-2018, the SQLAlchemy authors and contributors'
 # The short X.Y version.
 version = "1.2"
 # The full version, including alpha/beta/rc tags.
-release = "1.2.1"
+release = "1.2.2"
 
-release_date = "January 15, 2018"
+release_date = "January 24, 2018"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"