Merge branch 'master' into dev

CHANGELOG.md

@@ -5,11 +5,15 @@ emqttd ChangeLog
 0.8.1-alpha (2015-05-28)
 -------------------------
 
+Client [Presence](https://github.com/emqtt/emqttd/wiki/Presence) Support and [$SYS Topics](https://github.com/emqtt/emqttd/wiki/$SYS-Topics) Redesigned!
+
 Bugfix: issue #138 - when client disconnected normally, broker will not publish disconnected $SYS message
 
 Bugfix: fix websocket url in emqttd/priv/www/websocket.html
 
-Improve: issue #136 - $SYS topics result should not include $SYS messages
+Improve: etc/emqttd.config to allow websocket connections from any hosts
+
+Improve: rel/reltool.config to exclude unnecessary apps.
 
 
 0.8.0-alpha (2015-05-25)

apps/emqtt/src/emqtt.app.src

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

apps/emqttd/src/emqttd.app.src

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

rel/files/emqttd.config

@@ -174,10 +174,7 @@
             %% Maximum number of concurrent clients
             {max_clients, 512},
             %% Socket Access Control
-            {access, [
+            {access, [{allow, all}]},
-                {allow, "127.0.0.1"},
-                {deny, all}
-            ]},
             %% Socket Options
             {sockopts, [
                 {backlog, 1024}

rel/reltool.config

@@ -4,7 +4,7 @@
        {lib_dirs, ["../apps", "../deps", "../plugins"]},
        {erts, [{mod_cond, derived}, {app_file, strip}]},
        {app_file, strip},
-       {rel, "emqttd", "0.9.0",
+       {rel, "emqttd", "0.8.1",
         [
          kernel,
          stdlib,