From f165321d2bb0af6b400ec7a86f7c11d6ec0df6bf Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 28 May 2015 09:37:50 +0800 Subject: [PATCH 1/3] rm --- plugins/emqttd_dashboard | 1 - 1 file changed, 1 deletion(-) delete mode 160000 plugins/emqttd_dashboard diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard deleted file mode 160000 index 300bb7445..000000000 --- a/plugins/emqttd_dashboard +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 300bb74452764ac27c261ae000495791397b2a28 From 3ed65b419cdf479f17b7775b7404597f41f04808 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 28 May 2015 09:45:37 +0800 Subject: [PATCH 2/3] fix websocket url --- apps/emqttd/priv/www/websocket.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqttd/priv/www/websocket.html b/apps/emqttd/priv/www/websocket.html index 7ac1fda17..eb7784226 100644 --- a/apps/emqttd/priv/www/websocket.html +++ b/apps/emqttd/priv/www/websocket.html @@ -31,7 +31,7 @@ return document.getElementById(id); } function go() { - ws = new WebSocket("ws://" + location.host + "/mqtt/wsocket"); + ws = new WebSocket("ws://" + location.host + "/mqtt"); ws.onopen = function () { $('connstate').innerHTML = 'CONNECTED'; } From f84a99f05f711b304326f6c7a316573096c3ce09 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 28 May 2015 09:47:02 +0800 Subject: [PATCH 3/3] 0.8.1 --- CHANGELOG.md | 2 ++ tests/org.eclipse.paho.mqtt.testing | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 700532931..5c1610db3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ emqttd ChangeLog 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 diff --git a/tests/org.eclipse.paho.mqtt.testing b/tests/org.eclipse.paho.mqtt.testing index 17afdf7fb..bdc690db8 160000 --- a/tests/org.eclipse.paho.mqtt.testing +++ b/tests/org.eclipse.paho.mqtt.testing @@ -1 +1 @@ -Subproject commit 17afdf7fb8e148f376d63592bbf3dd4ccdf19e84 +Subproject commit bdc690db847cec1c682e604dca571c72ff756305