cherry-pick changelog update for 1.1.18

diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst
index 37b051f508a5907337c454a42a87aea00d313763..608b802a8f640301ffc76b5e6fe9f28eb7a53d44 100644 (file)
--- a/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@ -17,6 +17,10 @@
         :start-line: 5
 
 
+.. changelog::
+    :version: 1.1.18
+    :include_notes_from: unreleased_11
+
 .. changelog::
     :version: 1.1.17
     :released: February 22, 2018