From c514741210f631436e6e3252cc7375130d9dc748 Mon Sep 17 00:00:00 2001 From: Feng Date: Thu, 28 Jul 2016 23:21:38 +0800 Subject: [PATCH 1/7] latest --- docs/source/install.rst | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/source/install.rst b/docs/source/install.rst index 044d5e85a..8bb68e4f8 100644 --- a/docs/source/install.rst +++ b/docs/source/install.rst @@ -19,19 +19,19 @@ Download Packages Download binary packages from: http://emqtt.io/downloads -+-----------+-----------------------------------+ -| Debian | http://emqtt.io/downloads/debian | -+-----------+-----------------------------------+ -| Ubuntu | http://emqtt.io/downloads/ubuntu | -+-----------+-----------------------------------+ -| CentOS | http://emqtt.io/downloads/centos | -+-----------+-----------------------------------+ -| FreeBSD | http://emqtt.io/downloads/freebsd | -+-----------+-----------------------------------+ -| Mac OS X | http://emqtt.io/downloads/macosx | -+-----------+-----------------------------------+ -| Windows | http://emqtt.io/downloads/windows | -+-----------+-----------------------------------+ ++-----------+------------------------------------------+ +| Debian | http://emqtt.io/downloads/latest/debian | ++-----------+------------------------------------------+ +| Ubuntu | http://emqtt.io/downloads/latest/ubuntu | ++-----------+------------------------------------------+ +| CentOS | http://emqtt.io/downloads/latest/centos | ++-----------+------------------------------------------+ +| FreeBSD | http://emqtt.io/downloads/latest/freebsd | ++-----------+------------------------------------------+ +| Mac OS X | http://emqtt.io/downloads/latest/macosx | ++-----------+------------------------------------------+ +| Windows | http://emqtt.io/downloads/latest/windows | ++-----------+------------------------------------------+ The package name consists of platform, version and release time. @@ -43,7 +43,7 @@ For example: emqttd-centos64-1.1-beta-20160601.zip Installing on Linux ------------------- -Download CentOS Package from: http://emqtt.io/downloads/centos, and then unzip: +Download CentOS Package from: http://emqtt.io/downloads/latest/centos, and then unzip: .. code-block:: bash @@ -116,7 +116,7 @@ Stop the broker:: Installing on FreeBSD --------------------- -Download FreeBSD Package from: http://emqtt.io/downloads/freebsd +Download FreeBSD Package from: http://emqtt.io/downloads/latest/freebsd The installing process is same to Linux. @@ -128,7 +128,7 @@ Installing on Mac OS X We could install the broker on Mac OS X to develop and debug MQTT applications. -Download Mac Package from: http://emqtt.io/downloads/macosx +Download Mac Package from: http://emqtt.io/downloads/latest/macosx Configure 'lager' log level in 'etc/emqttd.config', all MQTT messages recevied/sent will be printed on console: @@ -150,7 +150,7 @@ The install and boot process on Mac are same to Linux. Installing on Windows --------------------- -Download Package from: http://emqtt.io/downloads/windows. +Download Package from: http://emqtt.io/downloads/latest/windows. Unzip the package to install folder. Open the command line window and 'cd' to the folder. From a6f050b80b267493b3a5a5d18ce1f2ea1d4e8d2e Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 19 Aug 2016 14:28:19 +0800 Subject: [PATCH 2/7] Version 1.1.3 --- docs/source/changes.rst | 20 ++++++++++++++++++++ src/emqttd.app.src | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/docs/source/changes.rst b/docs/source/changes.rst index 548233125..e81633c82 100644 --- a/docs/source/changes.rst +++ b/docs/source/changes.rst @@ -5,6 +5,26 @@ Changes ======= +.. _release_1.1.3: + +------------- +Version 1.1.3 +------------- + +*Release Date: 2016-08-19* + +Support './bin/emqttd_ctl users list' CLI (#621) + +Cannot publish payloads with a size of the order 64K using WebSockets (#643) + +Optimize the procedures that retrieve the Broker version and Borker description in the tick timer (PR#627) + +Fix SSL certfile, keyfile config (#651) + +------------- +Version 1.1.2 +------------- + .. _release_1.1.2: ------------- diff --git a/src/emqttd.app.src b/src/emqttd.app.src index be726aa9f..6290ae6b4 100644 --- a/src/emqttd.app.src +++ b/src/emqttd.app.src @@ -1,7 +1,7 @@ {application, emqttd, [ {description, "Erlang MQTT Broker"}, - {vsn, "1.1.2"}, + {vsn, "1.1.3"}, {id, "emqttd"}, {modules, []}, {registered, []}, From f44a8570d26baaef0b3bba2e054b3dbb03b016f4 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 19 Aug 2016 15:12:22 +0800 Subject: [PATCH 3/7] upgrade plugins to 1.1.3 --- plugins/emqttd_auth_http | 2 +- plugins/emqttd_dashboard | 2 +- plugins/emqttd_plugin_mongo | 2 +- plugins/emqttd_plugin_pgsql | 2 +- plugins/emqttd_plugin_redis | 2 +- plugins/emqttd_plugin_template | 2 +- plugins/emqttd_reloader | 2 +- plugins/emqttd_stomp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/emqttd_auth_http b/plugins/emqttd_auth_http index cd6ae58f1..d5a40dbea 160000 --- a/plugins/emqttd_auth_http +++ b/plugins/emqttd_auth_http @@ -1 +1 @@ -Subproject commit cd6ae58f1674165f2033bff6b7af819c1f3a169d +Subproject commit d5a40dbea347b3aa4a7631dec40cc09ee5ec4024 diff --git a/plugins/emqttd_dashboard b/plugins/emqttd_dashboard index fff5eb17b..95a3d0964 160000 --- a/plugins/emqttd_dashboard +++ b/plugins/emqttd_dashboard @@ -1 +1 @@ -Subproject commit fff5eb17b02a41ed9e928013bc318914cd6269a6 +Subproject commit 95a3d0964b2d6d4541fdabe6c07869a14f4c990d diff --git a/plugins/emqttd_plugin_mongo b/plugins/emqttd_plugin_mongo index 95143c1a4..7ed2f9c51 160000 --- a/plugins/emqttd_plugin_mongo +++ b/plugins/emqttd_plugin_mongo @@ -1 +1 @@ -Subproject commit 95143c1a44f28cc38ac6c6a77c15cc9b5f433791 +Subproject commit 7ed2f9c51f0f3a2ea9b0003705b0dd30c3f3ba9e diff --git a/plugins/emqttd_plugin_pgsql b/plugins/emqttd_plugin_pgsql index e1d67068a..f4c571e74 160000 --- a/plugins/emqttd_plugin_pgsql +++ b/plugins/emqttd_plugin_pgsql @@ -1 +1 @@ -Subproject commit e1d67068aabcc297956d2fd8aabe7f2dd1817650 +Subproject commit f4c571e74fbc02c1f02368ba69e5b08f4468e4e8 diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis index 285abd943..7ef337d66 160000 --- a/plugins/emqttd_plugin_redis +++ b/plugins/emqttd_plugin_redis @@ -1 +1 @@ -Subproject commit 285abd943850736bff04ac5e877cba2c3093ae25 +Subproject commit 7ef337d6653981aee6059252e030835e6c77d10e diff --git a/plugins/emqttd_plugin_template b/plugins/emqttd_plugin_template index c2c94e1d4..c05985ae5 160000 --- a/plugins/emqttd_plugin_template +++ b/plugins/emqttd_plugin_template @@ -1 +1 @@ -Subproject commit c2c94e1d49dd26b1d558e7632c925ea319093294 +Subproject commit c05985ae5828ea8a1cc364cc9a0ad764ea009a5d diff --git a/plugins/emqttd_reloader b/plugins/emqttd_reloader index 3521c5d07..0e1da2339 160000 --- a/plugins/emqttd_reloader +++ b/plugins/emqttd_reloader @@ -1 +1 @@ -Subproject commit 3521c5d07c24da5b362196de89bb0d250d42eccc +Subproject commit 0e1da23391951ad7f7d83e07d26b78bb7d0c3191 diff --git a/plugins/emqttd_stomp b/plugins/emqttd_stomp index fb97df1bb..ccf192844 160000 --- a/plugins/emqttd_stomp +++ b/plugins/emqttd_stomp @@ -1 +1 @@ -Subproject commit fb97df1bb3e4a813c44f48161aef32cac428eb87 +Subproject commit ccf19284402fa305ef392577aa2ce6edc18890ae From a59478e6539d1460dd941bf8c998c4fcbeebb229 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 19 Aug 2016 15:22:19 +0800 Subject: [PATCH 4/7] upgrade recon plugin --- plugins/emqttd_recon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_recon b/plugins/emqttd_recon index 4b0721609..d4879c24f 160000 --- a/plugins/emqttd_recon +++ b/plugins/emqttd_recon @@ -1 +1 @@ -Subproject commit 4b0721609ca605b0a052b46eb753185afebc9fda +Subproject commit d4879c24f055e4215b5a984cfed72ecd5945df2d From eb0d88956626341cbad6e172195e78727b765ac6 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 19 Aug 2016 15:30:00 +0800 Subject: [PATCH 5/7] stable branch --- .gitmodules | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitmodules b/.gitmodules index 4d56b5203..45d0a819c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,33 +1,43 @@ [submodule "plugins/emqttd_dashboard"] path = plugins/emqttd_dashboard url = https://github.com/emqtt/emqttd_dashboard.git + branch = stable [submodule "plugins/emqttd_plugin_template"] path = plugins/emqttd_plugin_template url = https://github.com/emqtt/emqttd_plugin_template.git + branch = stable [submodule "plugins/emqttd_plugin_pgsql"] path = plugins/emqttd_plugin_pgsql url = https://github.com/emqtt/emqttd_plugin_pgsql.git + branch = stable [submodule "plugins/emqttd_plugin_mysql"] path = plugins/emqttd_plugin_mysql url = https://github.com/emqtt/emqttd_plugin_mysql.git + branch = stable [submodule "plugins/emqttd_sockjs"] path = plugins/emqttd_sockjs url = https://github.com/emqtt/emqttd_sockjs.git + branch = stable [submodule "plugins/emqttd_stomp"] path = plugins/emqttd_stomp url = https://github.com/emqtt/emqttd_stomp.git + branch = stable [submodule "plugins/emqttd_recon"] path = plugins/emqttd_recon url = https://github.com/emqtt/emqttd_recon.git + branch = stable [submodule "plugins/emqttd_plugin_redis"] path = plugins/emqttd_plugin_redis url = https://github.com/emqtt/emqttd_plugin_redis.git + branch = stable [submodule "plugins/emqttd_reloader"] path = plugins/emqttd_reloader url = https://github.com/emqtt/emqttd_reloader.git + branch = stable [submodule "plugins/emqttd_plugin_mongo"] path = plugins/emqttd_plugin_mongo url = https://github.com/emqtt/emqttd_plugin_mongo.git [submodule "plugins/emqttd_auth_http"] path = plugins/emqttd_auth_http url = https://github.com/emqtt/emqttd_auth_http.git + branch = stable From 5b301a7b5bf28632588249c5af02fbad5541a173 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 19 Aug 2016 15:36:52 +0800 Subject: [PATCH 6/7] 1.1.3 --- plugins/emqttd_plugin_mysql | 2 +- plugins/emqttd_plugin_redis | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/emqttd_plugin_mysql b/plugins/emqttd_plugin_mysql index 821766632..e91b17f28 160000 --- a/plugins/emqttd_plugin_mysql +++ b/plugins/emqttd_plugin_mysql @@ -1 +1 @@ -Subproject commit 82176663240c1bff825a903c254a86ebb9031b5a +Subproject commit e91b17f2880756ae0c411373594e5e226478c4fb diff --git a/plugins/emqttd_plugin_redis b/plugins/emqttd_plugin_redis index 7ef337d66..10bda5043 160000 --- a/plugins/emqttd_plugin_redis +++ b/plugins/emqttd_plugin_redis @@ -1 +1 @@ -Subproject commit 7ef337d6653981aee6059252e030835e6c77d10e +Subproject commit 10bda5043e437f8bd5c4997d4929006fbb6931e1 From feb0707a1833b70134e17388e669d6e6af828c36 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 19 Aug 2016 15:41:54 +0800 Subject: [PATCH 7/7] mochiweb 4.1.1 --- rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rebar.config b/rebar.config index cc8ab8f54..dc548c0b1 100644 --- a/rebar.config +++ b/rebar.config @@ -42,7 +42,7 @@ {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}}, {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}}, {esockd, ".*", {git, "git://github.com/emqtt/esockd.git", {tag, "4.0"}}}, - {mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {tag, "4.1"}}} + {mochiweb, "4.*", {git, "git://github.com/emqtt/mochiweb.git", {tag, "4.1.1"}}} ]}. {recursive_cmds, [ct, eunit, clean]}.