From da14164b1133b485ce7d4bb82ce65df3bfa79b03 Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Fri, 7 Apr 2017 09:17:20 -0700
Subject: [PATCH] Mention #2525 was fixed by #2526

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e6338d9375a..327ec19ee66f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.0 (Unreleased)
+
+BUG FIXES:
+ * server: Reject non-TLS clients when TLS enabled [GH-2525]
+
 ## 0.5.6 (March 31, 2017)
 
 IMPROVEMENTS: