From 67ebff26ce14eb3d04f53c023394234d4922000b Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Fri, 16 Oct 2015 15:07:25 +0800
Subject: [PATCH] 0.12.2

---
 CHANGELOG.md       | 6 ++++++
 src/emqttd.app.src | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf291b55b..a74e3aeb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 emqttd ChangeLog
 ==================
 
+0.12.2-beta (2015-10-16)
+-------------------------
+
+Bugfix: Retained messages should not be expired if 'broker.retained.expired_after = 0' (#346)
+
+
 0.12.1-beta (2015-10-15)
 -------------------------
 
diff --git a/src/emqttd.app.src b/src/emqttd.app.src
index 570dec511..cdffc28bc 100644
--- a/src/emqttd.app.src
+++ b/src/emqttd.app.src
@@ -2,7 +2,7 @@
  [
   {description, "Erlang MQTT Broker"},
   {id, "emqttd"},
-  {vsn, "0.12.1"},
+  {vsn, "0.12.2"},
   {modules, []},
   {registered, []},
   {applications, [kernel,