From 3e37848f07a1d07421576aa826544af6b8bb3724 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 29 Jun 2018 13:45:17 -0400
Subject: [PATCH] cherry-pick changelog update for 1.2.10

---
 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 8a7c2059a9..1dad90d215 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.10
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.9
     :released: June 29, 2018
-- 
2.47.3