From b1c04e7660935ad698f24b729947c8bb65d74fd7 Mon Sep 17 00:00:00 2001
From: Ryan Uber <ru@ryanuber.com>
Date: Fri, 12 Jun 2015 10:40:51 -0700
Subject: [PATCH] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c251de50bf..19677d1660 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,13 @@
 ## 0.6.0 (Unreleased)
 
+FEATURES:
+
+* Service ACL's apply to service discovery [GH-1024]
+
 BUG FIXES:
 
 * Allow services with `/` characters in the UI [GH-988]
+* Token hiding in HTTP logs bug fixed [GH-1020]
 
 MISC: