Merge pull request #652 from emqtt/emq10

Bump version to 1.1.3
This commit is contained in:
Feng Lee 2016-08-19 15:49:30 +08:00 committed by GitHub
commit 824c960c26
14 changed files with 42 additions and 12 deletions

10
.gitmodules vendored
View File

@ -1,33 +1,43 @@
[submodule "plugins/emqttd_dashboard"] [submodule "plugins/emqttd_dashboard"]
path = plugins/emqttd_dashboard path = plugins/emqttd_dashboard
url = https://github.com/emqtt/emqttd_dashboard.git url = https://github.com/emqtt/emqttd_dashboard.git
branch = stable
[submodule "plugins/emqttd_plugin_template"] [submodule "plugins/emqttd_plugin_template"]
path = plugins/emqttd_plugin_template path = plugins/emqttd_plugin_template
url = https://github.com/emqtt/emqttd_plugin_template.git url = https://github.com/emqtt/emqttd_plugin_template.git
branch = stable
[submodule "plugins/emqttd_plugin_pgsql"] [submodule "plugins/emqttd_plugin_pgsql"]
path = plugins/emqttd_plugin_pgsql path = plugins/emqttd_plugin_pgsql
url = https://github.com/emqtt/emqttd_plugin_pgsql.git url = https://github.com/emqtt/emqttd_plugin_pgsql.git
branch = stable
[submodule "plugins/emqttd_plugin_mysql"] [submodule "plugins/emqttd_plugin_mysql"]
path = plugins/emqttd_plugin_mysql path = plugins/emqttd_plugin_mysql
url = https://github.com/emqtt/emqttd_plugin_mysql.git url = https://github.com/emqtt/emqttd_plugin_mysql.git
branch = stable
[submodule "plugins/emqttd_sockjs"] [submodule "plugins/emqttd_sockjs"]
path = plugins/emqttd_sockjs path = plugins/emqttd_sockjs
url = https://github.com/emqtt/emqttd_sockjs.git url = https://github.com/emqtt/emqttd_sockjs.git
branch = stable
[submodule "plugins/emqttd_stomp"] [submodule "plugins/emqttd_stomp"]
path = plugins/emqttd_stomp path = plugins/emqttd_stomp
url = https://github.com/emqtt/emqttd_stomp.git url = https://github.com/emqtt/emqttd_stomp.git
branch = stable
[submodule "plugins/emqttd_recon"] [submodule "plugins/emqttd_recon"]
path = plugins/emqttd_recon path = plugins/emqttd_recon
url = https://github.com/emqtt/emqttd_recon.git url = https://github.com/emqtt/emqttd_recon.git
branch = stable
[submodule "plugins/emqttd_plugin_redis"] [submodule "plugins/emqttd_plugin_redis"]
path = plugins/emqttd_plugin_redis path = plugins/emqttd_plugin_redis
url = https://github.com/emqtt/emqttd_plugin_redis.git url = https://github.com/emqtt/emqttd_plugin_redis.git
branch = stable
[submodule "plugins/emqttd_reloader"] [submodule "plugins/emqttd_reloader"]
path = plugins/emqttd_reloader path = plugins/emqttd_reloader
url = https://github.com/emqtt/emqttd_reloader.git url = https://github.com/emqtt/emqttd_reloader.git
branch = stable
[submodule "plugins/emqttd_plugin_mongo"] [submodule "plugins/emqttd_plugin_mongo"]
path = plugins/emqttd_plugin_mongo path = plugins/emqttd_plugin_mongo
url = https://github.com/emqtt/emqttd_plugin_mongo.git url = https://github.com/emqtt/emqttd_plugin_mongo.git
[submodule "plugins/emqttd_auth_http"] [submodule "plugins/emqttd_auth_http"]
path = plugins/emqttd_auth_http path = plugins/emqttd_auth_http
url = https://github.com/emqtt/emqttd_auth_http.git url = https://github.com/emqtt/emqttd_auth_http.git
branch = stable

View File

@ -5,6 +5,26 @@
Changes 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: .. _release_1.1.2:
------------- -------------

@ -1 +1 @@
Subproject commit cd6ae58f1674165f2033bff6b7af819c1f3a169d Subproject commit d5a40dbea347b3aa4a7631dec40cc09ee5ec4024

@ -1 +1 @@
Subproject commit fff5eb17b02a41ed9e928013bc318914cd6269a6 Subproject commit 95a3d0964b2d6d4541fdabe6c07869a14f4c990d

@ -1 +1 @@
Subproject commit 95143c1a44f28cc38ac6c6a77c15cc9b5f433791 Subproject commit 7ed2f9c51f0f3a2ea9b0003705b0dd30c3f3ba9e

@ -1 +1 @@
Subproject commit 82176663240c1bff825a903c254a86ebb9031b5a Subproject commit e91b17f2880756ae0c411373594e5e226478c4fb

@ -1 +1 @@
Subproject commit e1d67068aabcc297956d2fd8aabe7f2dd1817650 Subproject commit f4c571e74fbc02c1f02368ba69e5b08f4468e4e8

@ -1 +1 @@
Subproject commit 285abd943850736bff04ac5e877cba2c3093ae25 Subproject commit 10bda5043e437f8bd5c4997d4929006fbb6931e1

@ -1 +1 @@
Subproject commit c2c94e1d49dd26b1d558e7632c925ea319093294 Subproject commit c05985ae5828ea8a1cc364cc9a0ad764ea009a5d

@ -1 +1 @@
Subproject commit 4b0721609ca605b0a052b46eb753185afebc9fda Subproject commit d4879c24f055e4215b5a984cfed72ecd5945df2d

@ -1 +1 @@
Subproject commit 3521c5d07c24da5b362196de89bb0d250d42eccc Subproject commit 0e1da23391951ad7f7d83e07d26b78bb7d0c3191

@ -1 +1 @@
Subproject commit fb97df1bb3e4a813c44f48161aef32cac428eb87 Subproject commit ccf19284402fa305ef392577aa2ce6edc18890ae

View File

@ -42,7 +42,7 @@
{gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}}, {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}},
{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}}, {lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
{esockd, ".*", {git, "git://github.com/emqtt/esockd.git", {tag, "4.0"}}}, {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]}. {recursive_cmds, [ct, eunit, clean]}.

View File

@ -1,7 +1,7 @@
{application, emqttd, {application, emqttd,
[ [
{description, "Erlang MQTT Broker"}, {description, "Erlang MQTT Broker"},
{vsn, "1.1.2"}, {vsn, "1.1.3"},
{id, "emqttd"}, {id, "emqttd"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},