From a5d4653b6e26420a61be6e80fef8a0645cb64ceb Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 13 Jul 2018 19:03:48 -0400
Subject: [PATCH] cherry-pick changelog update for 1.2.11

---
 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 e563995c51..d0a30c2103 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.11
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.10
     :released: July 13, 2018
-- 
2.47.2