yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Feng Lee 2015-05-06 02:13:39 +08:00
parent 90b0835950 18e7de8e0f
commit 6cf39e4520
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -7,6 +7,12 @@ emqttd ChangeLog
Add doc/design/* and merge doc/* to github Wiki 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) 0.7.0-alpha (2015-05-02)
------------------------- -------------------------

2
apps/emqtt/src/emqtt.app.src
View File

@ -1,7 +1,7 @@
{application, emqtt, {application, emqtt,
[ [
{description, "Erlang MQTT Common Library"}, {description, "Erlang MQTT Common Library"},
{vsn, "0.7.0"}, {vsn, "0.7.1"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [ {applications, [

2
apps/emqttd/src/emqttd.app.src
View File

@ -1,7 +1,7 @@
{application, emqttd, {application, emqttd,
[ [
{description, "Erlang MQTT Broker"}, {description, "Erlang MQTT Broker"},
{vsn, "0.7.0"}, {vsn, "0.7.1"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [kernel, {applications, [kernel,

2
apps/emqttd/src/emqttd_ctl.erl
View File

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