From 74145cf5df50ceb893a232662694ccaadbb33f62 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Sun, 23 Jul 2017 18:55:21 +0800 Subject: [PATCH 1/3] Depends on master branch of ekka library --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9270a562e..3738111b4 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ dep_gproc = git https://github.com/uwiger/gproc dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_lager = git https://github.com/basho/lager master dep_esockd = git https://github.com/emqtt/esockd master -dep_ekka = git https://github.com/emqtt/ekka develop +dep_ekka = git https://github.com/emqtt/ekka master dep_mochiweb = git https://github.com/emqtt/mochiweb master dep_pbkdf2 = git https://github.com/emqtt/pbkdf2 2.0.1 dep_lager_syslog = git https://github.com/basho/lager_syslog From 471ff5e90932a149b4d09ed39246c03b0ec200c1 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 24 Jul 2017 14:49:38 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index a4f7432e6..2dc624937 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ # *EMQ* - Erlang MQTT Broker [![Build Status](https://travis-ci.org/emqtt/emqttd.svg?branch=master)](https://travis-ci.org/emqtt/emqttd) -[](http://slack.emqtt.io) *EMQ* (Erlang MQTT Broker) is a distributed, massively scalable, highly extensible MQTT message broker written in Erlang/OTP. From 087f51e018a20449ca2875fded8f68d2ef7abf9e Mon Sep 17 00:00:00 2001 From: getong Date: Thu, 17 Aug 2017 11:42:19 +0000 Subject: [PATCH 3/3] add erlang 20 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 15834e620..9f17acf2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ otp_release: - 19.0 - 19.1 - 19.2 + - 20.0 script: - make