- 1.0.19

Change-Id: I65ebe00fa7372151210a1f177f5417ac08c41586
(cherry picked from commit 90ef2c2314187b00e037a4b347b5d62eec387aac)

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index 7dd702325de67838d1f3ca11e9b56741e4312990..5a441bb0adc3531356e4b51b7661bc914b551d14 100644 (file)
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,7 +18,23 @@
 
 .. changelog::
     :version: 1.0.19
-    :include_notes_from: unreleased_10
+    :released: August 3, 2017
+
+    .. change::
+        :tags: bug, oracle, performance, py2k
+        :tickets: 4035
+        :versions: 1.0.19, 1.1.13, 1.2.0b3
+
+        Fixed performance regression caused by the fix for :ticket:`3937` where
+        cx_Oracle as of version 5.3 dropped the ``.UNICODE`` symbol from its
+        namespace,  which was interpreted as cx_Oracle's "WITH_UNICODE" mode being
+        turned on unconditionally, which invokes functions on the SQLAlchemy
+        side which convert all strings to unicode unconditionally and causing
+        a performance impact.  In fact, per cx_Oracle's author the
+        "WITH_UNICODE" mode has been removed entirely as of 5.1, so the expensive unicode
+        conversion functions are no longer necessary and are disabled if
+        cx_Oracle 5.1 or greater is detected under Python 2.  The warning against
+        "WITH_UNICODE" mode that was removed under :ticket:`3937` is also restored.
 
 .. changelog::
     :version: 1.0.18

diff --git a/doc/build/changelog/unreleased_10/4035.rst b/doc/build/changelog/unreleased_10/4035.rst
deleted file mode 100644 (file)
index b1dcd7d..0000000
--- a/doc/build/changelog/unreleased_10/4035.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. change::
-    :tags: bug, oracle, performance, py2k
-    :tickets: 4035
-    :versions: 1.0.19, 1.1.13, 1.2.0b3
-
-    Fixed performance regression caused by the fix for :ticket:`3937` where
-    cx_Oracle as of version 5.3 dropped the ``.UNICODE`` symbol from its
-    namespace,  which was interpreted as cx_Oracle's "WITH_UNICODE" mode being
-    turned on unconditionally, which invokes functions on the SQLAlchemy
-    side which convert all strings to unicode unconditionally and causing
-    a performance impact.  In fact, per cx_Oracle's author the
-    "WITH_UNICODE" mode has been removed entirely as of 5.1, so the expensive unicode
-    conversion functions are no longer necessary and are disabled if
-    cx_Oracle 5.1 or greater is detected under Python 2.  The warning against
-    "WITH_UNICODE" mode that was removed under :ticket:`3937` is also restored.