From 6ec5eccd69f32a4b394b13d8d29f20dba7e39500 Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Thu, 17 Dec 2015 17:30:49 +0800
Subject: [PATCH 1/4] fix issue #411

---
 src/emqttd_sm.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emqttd_sm.erl b/src/emqttd_sm.erl
index d08b28d50..a9ff6659b 100644
--- a/src/emqttd_sm.erl
+++ b/src/emqttd_sm.erl
@@ -103,7 +103,7 @@ start_session(CleanSess, ClientId) ->
 %% @doc Lookup a Session
 %% @end
 %%------------------------------------------------------------------------------
--spec lookup_session(binary()) -> pid() | undefined.
+-spec lookup_session(binary()) -> mqtt_session() | undefined.
 lookup_session(ClientId) ->
     case mnesia:dirty_read(session, ClientId) of
         [Session] -> Session;

From 54816358868b6331f86776e3d358b419b44b43d9 Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Thu, 17 Dec 2015 19:59:47 +0800
Subject: [PATCH 2/4] fix issue #410 - remove observer app

---
 rel/reltool.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rel/reltool.config b/rel/reltool.config
index 33d985545..1c0fc3356 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -56,7 +56,6 @@
        {app, inets, [{incl_cond, include}]},
        {app, compiler, [{incl_cond, include}]},
        {app, runtime_tools, [{incl_cond, include}]},
-       {app, observer, [{incl_cond, include}]},
        {app, goldrush, [{incl_cond, include}]},
        {app, gen_logger, [{incl_cond, include}]},
        {app, lager, [{incl_cond, include}]},

From 74392485934e89acb22c56d2d26313212448be1a Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Thu, 17 Dec 2015 23:46:09 +0800
Subject: [PATCH 3/4] 0.14

---
 TODO | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 TODO

diff --git a/TODO b/TODO
deleted file mode 100644
index 8fe87861d..000000000
--- a/TODO
+++ /dev/null
@@ -1,20 +0,0 @@
-
-DONE TODO 1. refactor gproc_pool usage
-
-DONE TODO 2. emqttd_router, emqttd_pubsub to route message
-
-DONE TODO 3. sup, pool_sup, manager......
-
-DONE TODO 4. route ageing...
-
-TODO 5. dashboard
-
-TODO 6. emqttd_ctl
-
-DONE TODO 7. transaction on route, and topic?
-
-TODO 8. topics, subscriptions CLI
-
-DONE TODO 9. LOG.....
-
-DONE TODO 10. emqttd_sm.erl to remove mnesia:index_read...

From 8504da47e7ec49e20c429530a01c6c6ecc6994ce Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Thu, 17 Dec 2015 23:52:03 +0800
Subject: [PATCH 4/4] 0.14

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e79f60ba..5de7d67ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,50 @@
 emqttd ChangeLog
 ==================
 
+0.14.0-beta(2015-12-18)
+-------------------------
+
+#### Highlights
+
+Scaling to 1.3 Million Concurrent MQTT Connections on a 12 Core, 32G CentOS server.
+
+New PubSub, Router Design (#402). Prepare for scaling to 10 millions on one cluster.
+
+#### Enhancements
+
+Improve the gproc_pool usage with a general emqttd_pool_sup
+
+Improve the design of emqttd_pubsub, add a new emqttd_router module
+
+Improve the design of the whole supervisor tree
+
+Route aging mechanism to remove the topics that have no subscriptions
+
+Improve the dashboard, mysql, pgsql, stomp, sockjs plugins
+
+Add 'topics', 'subscriptions' admin commands
+
+Avoid using mnesia table index and mnesia:index_read API to lower CPU usage
+
+Subscribe timeout exception (#366)
+
+Long Delay on Multiple Topic Subscription (#365)
+
+Subscriptions persistence (#344)
+
+emqttd_ctl: 'subscriptions' command to force clients to subscribe some topics (#361)
+
+#### Bugfix
+
+emqttd_sm: spec of lookup_session/1 is not right BUG (#411)
+
+Observer application should be removed from reltool.config for 'wx' app is not available (#410)
+
+#### Benchmark
+
+1.3 million concurrent MQTT connections on a 12 Core, 32G CentOS Server, consume about 15G Memory and 200% CPU.
+
+
 0.13.1-beta(2015-11-28)
 -------------------------