From aafc4cb2c93e474e068983927475ea3f2f370524 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 20 Aug 2018 17:00:53 -0400
Subject: [PATCH] cherry-pick changelog update for 1.2.12

---
 doc/build/changelog/changelog_12.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/build/changelog/changelog_12.rst b/doc/build/changelog/changelog_12.rst
index e8a1723d60..3990b26e9a 100644
--- 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.12
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.11
     :released: August 20, 2018
-- 
2.47.3