Merge branch 'master' into issue#111

2015-05-05 11:18:42 +08:00 · 2015-05-05 11:18:42 +08:00 · d99cd5905d
parent 613d38e288 aae3258beb
commit d99cd5905d
3 changed files with 8 additions and 2 deletions
--- 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)
 -------------------------
--- 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, [
--- 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,