From 55f930ef3d4e60bed02a2dad16e331fe42cfd12b Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 11 Jan 2019 10:15:39 -0500
Subject: [PATCH] cherry-pick changelog update for 1.2.17

---
 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 f1cc8e332f..c481fcd2c1 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.17
+    :include_notes_from: unreleased_12
+
 .. changelog::
     :version: 1.2.16
     :released: January 11, 2019
-- 
2.47.2