From 35798292b5e0be824a893d7e810ddabbee5903f0 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 16 Jun 2016 11:00:02 +0800 Subject: [PATCH 1/4] rm gitter --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af03f3975..43f7ff52f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -## Overview [![Build Status](https://travis-ci.org/emqtt/emqttd.svg?branch=master)](https://travis-ci.org/emqtt/emqttd) [![Join the chat at https://gitter.im/emqtt/emqttd](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/emqtt/emqttd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +## Overview [![Build Status](https://travis-ci.org/emqtt/emqttd.svg?branch=master)](https://travis-ci.org/emqtt/emqttd) emqttd is a massively scalable and clusterable MQTT V3.1/V3.1.1 broker written in Erlang/OTP. From 8c7c38021306339edd716baae5ab3d11c206c099 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 16 Jun 2016 14:25:15 +0800 Subject: [PATCH 2/4] architecture.png --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43f7ff52f..53e6727f5 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ Default Login/Password: admin/public ## Design -![emqttd architecture](http://emqtt.io/static/img/Architecture.png) +![emqttd architecture](http://emqtt.io/static/img/architecture.png) ## QuickStart From 6c0271fc6169a83a9b27a18f7ad7ac59cd3b8c7a Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Sat, 18 Jun 2016 14:14:38 +0800 Subject: [PATCH 3/4] upgrade mysql-otp driver to 1.2.0 and fix issue #586, #564, #523, #596 --- plugins/emqttd_plugin_mysql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/emqttd_plugin_mysql b/plugins/emqttd_plugin_mysql index ff967b404..f9a00100d 160000 --- a/plugins/emqttd_plugin_mysql +++ b/plugins/emqttd_plugin_mysql @@ -1 +1 @@ -Subproject commit ff967b4046ee7d4e568ebbdb248289bd3724b1f6 +Subproject commit f9a00100db19b864d7bdbe1eeca49978ea6934a9 From e9f94df21b16550dd18f315aec0a8117b50e91e6 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Sat, 18 Jun 2016 14:20:34 +0800 Subject: [PATCH 4/4] 1.1.2 --- src/emqttd.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqttd.app.src b/src/emqttd.app.src index 2f3f75de0..be726aa9f 100644 --- a/src/emqttd.app.src +++ b/src/emqttd.app.src @@ -1,7 +1,7 @@ {application, emqttd, [ {description, "Erlang MQTT Broker"}, - {vsn, "1.1.1"}, + {vsn, "1.1.2"}, {id, "emqttd"}, {modules, []}, {registered, []},