From 558d800239529672b5dc86e905ba3d5b6d880545 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 5 Feb 2018 21:39:49 -0500
Subject: [PATCH] Add 3.0.0-beta.6 to CHANGELOG [ci skip]

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cd1696da32..798e68f1daa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### 3.0.0-beta.6 (February 5, 2018)
+
+- [#16199](https://github.com/emberjs/ember.js/pull/16199) [BUGFIX] Mention "computed properties" in the assertion message
+- [#16200](https://github.com/emberjs/ember.js/pull/16200) [BUGFIX] Prevent test error by converting illegal characters
+
 ### 3.0.0-beta.5 (January 29, 2018)
 
 - [#16179](https://github.com/emberjs/ember.js/pull/16179) [BUGFIX] Fix a few bugs in the caching ArrayProxy implementation