From 71751960aa6516fb0dc5471d10b478a581a42811 Mon Sep 17 00:00:00 2001
From: Feng Lee <ery.lee@gmail.com>
Date: Mon, 4 May 2015 23:27:41 +0800
Subject: [PATCH 1/2] fix errors found by dialyzer

---
 apps/emqttd/src/emqttd_bridge_sup.erl | 2 +-
 apps/emqttd/src/emqttd_event.erl      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqttd/src/emqttd_bridge_sup.erl b/apps/emqttd/src/emqttd_bridge_sup.erl
index 5adda423a..93787937d 100644
--- a/apps/emqttd/src/emqttd_bridge_sup.erl
+++ b/apps/emqttd/src/emqttd_bridge_sup.erl
@@ -74,7 +74,7 @@ start_bridge(Node, SubTopic, Options) when is_atom(Node) and is_binary(SubTopic)
 -spec stop_bridge(atom(), binary()) -> {ok, pid()} | ok.
 stop_bridge(Node, SubTopic) ->
     ChildId = bridge_id(Node, SubTopic),
-    case supervisor:terminate_child(ChildId) of
+    case supervisor:terminate_child(?MODULE, ChildId) of
         ok -> 
             supervisor:delete_child(?MODULE, ChildId);
         {error, Reason} ->
diff --git a/apps/emqttd/src/emqttd_event.erl b/apps/emqttd/src/emqttd_event.erl
index 4fa57ac56..3db7817aa 100644
--- a/apps/emqttd/src/emqttd_event.erl
+++ b/apps/emqttd/src/emqttd_event.erl
@@ -114,5 +114,5 @@ payload(connected, Params) ->
     iolist_to_binary(io_lib:format("from: ~s~nprotocol: ~p~nsession: ~s", [From, Proto, Sess]));
 
 payload(disconnected, Reason) ->
-    list_to_binary(io_lib:format(["reason: ~p", Reason])).
+    list_to_binary(io_lib:format("reason: ~p", [Reason])).
 

From aae3258bebde82b01a148631392b1162343982ec Mon Sep 17 00:00:00 2001
From: Feng Lee <ery.lee@gmail.com>
Date: Mon, 4 May 2015 23:31:39 +0800
Subject: [PATCH 2/2] 0.7.1

---
 CHANGELOG.md                   | 6 ++++++
 apps/emqtt/src/emqtt.app.src   | 2 +-
 apps/emqttd/src/emqttd.app.src | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f71f6fedb..664f5bdf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ emqttd ChangeLog
 
 Add doc/design/* and merge doc/* to github Wiki
 
+Bugfix: issue #121 - emqttd cluster issuse
+
+Bugfix: issue #123 - emqttd:unload_all_plugins/0 cannot unload any plugin
+
+Bugfix: fix errors found by dialyzer
+
 
 0.7.0-alpha (2015-05-02)
 -------------------------
diff --git a/apps/emqtt/src/emqtt.app.src b/apps/emqtt/src/emqtt.app.src
index ac2d2417a..f156c6e98 100644
--- a/apps/emqtt/src/emqtt.app.src
+++ b/apps/emqtt/src/emqtt.app.src
@@ -1,7 +1,7 @@
 {application, emqtt,
  [
   {description, "Erlang MQTT Common Library"},
-  {vsn, "0.7.0"},
+  {vsn, "0.7.1"},
   {modules, []},
   {registered, []},
   {applications, [
diff --git a/apps/emqttd/src/emqttd.app.src b/apps/emqttd/src/emqttd.app.src
index 3e637230f..deedd416e 100644
--- a/apps/emqttd/src/emqttd.app.src
+++ b/apps/emqttd/src/emqttd.app.src
@@ -1,7 +1,7 @@
 {application, emqttd,
  [
   {description, "Erlang MQTT Broker"},
-  {vsn, "0.7.0"},
+  {vsn, "0.7.1"},
   {modules, []},
   {registered, []},
   {applications, [kernel,