Merge branch 'master' into dev

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)
 -------------------------

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, [

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,

apps/emqttd/src/emqttd_ctl.erl

@@ -95,7 +95,7 @@ cluster([SNode]) ->
     end.
 
 %%------------------------------------------------------------------------------
-%% @doc Add usern
+%% @doc Add user
 %% @end
 %%------------------------------------------------------------------------------
 useradd([Username, Password]) ->