cherry-pick changelog update for 1.2.6

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index c85380bbf8d98146a3924e5dee653e26657daee5..40faddee7a75ad294ee0494733869551b88743cc 100644 (file)
--- a/doc/build/changelog/changelog_12.rst
+++ b/doc/build/changelog/changelog_12.rst
@@ -10,6 +10,10 @@
     .. include:: changelog_10.rst
         :start-line: 5
 
+.. changelog::
+    :version: 1.2.6
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.5
     :released: March 6, 2018