From d8d72da84a522f8ec3bf9c4a495d3ecc41fd507c Mon Sep 17 00:00:00 2001
From: Damon Barry <damonbarry@users.noreply.github.com>
Date: Mon, 7 Nov 2022 16:47:36 -0800
Subject: [PATCH] Prepare for release 1.1.18 (#6765)

---
 CHANGELOG.md     | 13 +++++++++++++
 versionInfo.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de225d425c3..58b267706be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# 1.1.18 (2022-11-08)
+
+## Edge Hub
+### Bug Fixes
+* Update dotnetty and add timeouts to mitigate hanging calls [1e35757](https://github.com/Azure/iotedge/commit/1e3575713acbc9f82c887a69dad89d7e11d8111d)
+
+## Base image updates
+The following Docker images were updated because their base images changed:
+   * azureiotedge-agent
+   * azureiotedge-hub
+   * azureiotedge-simulated-temperature-sensor
+   * azureiotedge-diagnostics
+
 # 1.1.17 (2022-10-05)
 
 ## Edge Hub
diff --git a/versionInfo.json b/versionInfo.json
index 56f4a01701a..e4a1fb02461 100644
--- a/versionInfo.json
+++ b/versionInfo.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.17",
+  "version": "1.1.18",
   "build": "BUILDNUMBER",
   "commit": "COMMITID"
 }