- 1.2.4

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index 99dc9e56b84313937975b6f0b23223d205434838..73473995938424842f0e9b9dbf82de8460ffa352 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -12,7 +12,34 @@
 
 .. changelog::
     :version: 1.2.4
-    :include_notes_from: unreleased_12
+    :released: February 22, 2018
+
+    .. change::
+        :tags: bug, orm
+        :tickets: 4193
+
+        Fixed 1.2 regression in ORM versioning feature where a mapping against a
+        :func:`.select` or :func:`.alias` that also used a versioning column
+        against the underlying table would fail due to the check added as part of
+        :ticket:`3673`.
+
+    .. change::
+        :tags: bug, engine
+        :tickets: 4190
+
+        Fixed regression caused in 1.2.3 due to fix from :ticket:`4181` where
+        the changes to the event system involving :class:`.Engine` and
+        :class:`.OptionEngine` did not accommodate for event removals, which
+        would raise an ``AttributeError`` when invoked at the class
+        level.
+
+    .. change::
+        :tags: bug, sql
+        :tickets: 4197
+
+        Fixed bug where CTE expressions would not have their name or alias name
+        quoted when the given name is case sensitive or otherwise requires quoting.
+        Pull request courtesy Eric Atkin.
 
 .. changelog::
     :version: 1.2.3

diff --git a/doc/build/changelog/unreleased_12/4190.rst b/doc/build/changelog/unreleased_12/4190.rst
deleted file mode 100644 (file)
index 0969ea3..0000000
--- a/doc/build/changelog/unreleased_12/4190.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. change::
-    :tags: bug, engine
-    :tickets: 4190
-
-    Fixed regression caused in 1.2.3 due to fix from :ticket:`4181` where
-    the changes to the event system involving :class:`.Engine` and
-    :class:`.OptionEngine` did not accommodate for event removals, which
-    would raise an ``AttributeError`` when invoked at the class
-    level.

diff --git a/doc/build/changelog/unreleased_12/4193.rst b/doc/build/changelog/unreleased_12/4193.rst
deleted file mode 100644 (file)
index 3afc2f7..0000000
--- a/doc/build/changelog/unreleased_12/4193.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-.. change::
-    :tags: bug, orm
-    :tickets: 4193
-
-    Fixed 1.2 regression in ORM versioning feature where a mapping against a
-    :func:`.select` or :func:`.alias` that also used a versioning column
-    against the underlying table would fail due to the check added as part of
-    :ticket:`3673`.

diff --git a/doc/build/changelog/unreleased_12/4197.rst b/doc/build/changelog/unreleased_12/4197.rst
deleted file mode 100644 (file)
index 6e24c46..0000000
--- a/doc/build/changelog/unreleased_12/4197.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-.. change::
-    :tags: bug, sql
-    :tickets: 4197
-
-    Fixed bug where CTE expressions would not have their name or alias name
-    quoted when the given name is case sensitive or otherwise requires quoting.
-    Pull request courtesy Eric Atkin.

diff --git a/doc/build/conf.py b/doc/build/conf.py
index 15481d21018cf3b5244575f3c93a11909d3c1c25..33b70dff6ba7ec764fb9abe4c1dc74790ce8b192 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.3"
+release = "1.2.4"
 
-release_date = "February 16, 2018"
+release_date = "February 22, 2018"
 
 site_base = os.environ.get("RTD_SITE_BASE", "http://www.sqlalchemy.org")
 site_adapter_template = "docs_adapter.mako"