From 7a7afe5995d550b5ccf7170f4b3226e9793b2cfa Mon Sep 17 00:00:00 2001
From: Feng Lee <ery.lee@gmail.com>
Date: Wed, 14 Oct 2015 20:01:00 +0800
Subject: [PATCH] 0.12.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d95eb02eb..bf291b55b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,26 @@
 emqttd ChangeLog
 ==================
 
+0.12.1-beta (2015-10-15)
+-------------------------
+
+Highlight: Release for Bugfix and Code Refactor.
+
+Feature: Retained message expiration (#182)
+
+Improve: '$SYS/#' publish will not match '#' or '+/#' (#68)
+
+Improve: Add more metrics and ignore '$SYS/#' publish (#266)
+
+Improve: emqttd_sm should be optimized for clustered nodes may be crashed (#282)
+
+Improve: Refactor emqttd_sysmon and suppress 'monitor' messages (#328)
+
+Task: benchmark for 0.12.0 release (#225)
+
+Benchmark: About 900K concurrent connections established on a 20Core, 32G CentOS server.
+
+
 0.12.0-beta (2015-10-08)
 -------------------------