Commit Graph

78 Commits

Author SHA1 Message Date
turtleDeng 40abc9b4fe Merge develop to release3.1 (#2318) 2019-03-17 00:32:26 +08:00
spring2maz fbe67e6784 Introduce new bridge impl 2019-02-28 11:17:27 +08:00
turtleDeng 00863acea3
Merge emqx30 (#2181)
* Change the reason code in will topic acl check (#2168)

* Fix bridge bug (#2160)

* Limit bridge QoS less than 1

* Improve shared sub dispatch implementation. (#2144)

* Upgrade ekka, esockd libraries

* Improve the 'try_open_session' function

* Reload config (#2180)
2019-01-25 13:01:48 +08:00
Gilbert 9f83544fce
Fix failed testcase (#2127)
* Fix failed test case
Prior to this change, terry-xiaoyu enhanced the cuttlefish to
support emqx enterprise edtion configuration entries. But it cause 6
test case failed.

* Fix dep-vsn-check
2019-01-06 19:53:01 +08:00
turtleDeng 6a1ebe299a
Merge emqx32 to emqx30 (#2112) 2018-12-28 19:44:41 +08:00
turtled 390fae1134 Rm clique dep 2018-12-21 17:09:15 +08:00
terry-xiaoyu 14abbf96db Update cuttlefish tag 2018-12-14 09:53:13 +08:00
Shawn 93a079752f Update cuttlefish to v2.1.1 (#1978) 2018-11-23 11:04:55 +08:00
tigercl 551d5d99d2 Change 'aquire' to 'acquire' (#1976)
* Change 'aquire' to 'acquire'
2018-11-23 11:00:30 +08:00
turtled faeda253e1 Fix conflicts 2018-11-10 11:44:55 +08:00
terry-xiaoyu f6266eaa93 Bumped the version number of deps 2018-11-02 19:42:51 +08:00
terry-xiaoyu 94dbdffd59 New logger formatter with meta-data 2018-11-02 18:38:07 +08:00
spring2maz 28c8f2dd5c Remove neotoma plugin, build cuttlefish script in sub-dir 2018-10-27 14:21:53 +02:00
HuangDan e5f977d808 Upgrade the esockd library 2018-09-29 22:16:54 +08:00
spring2maz 9b2629e884 Fix dependency version discrepancy between Makefile and rebar.config 2018-09-25 22:09:13 +08:00
spring2maz 35d209f364 Fix travis build 2018-09-14 00:52:03 +08:00
spring2maz 0c39a7620e Rebar3 and erlang.mk dual support. (#1806)
* Rebar3 and erlang.mk dual support.

There was only erlang.mk support prior to this change.
The main reasons for this dual support are:
* Cover report upload can only be done by rebar3 in travis.ci
* We want to prepare for the future to build emqx releases using rebar3
* We do not want to stop supporting erlang.mk in one single step

* Add depencency version consistency check between erlang.mk and rebar.config
2018-09-09 21:51:42 +08:00
Feng Lee 16eef90707 Remove rebar.config 2017-09-13 07:43:02 +08:00
Feng Lee 88f7e71f29 Update rebar.config 2017-08-23 11:08:03 +08:00
Feng Lee 437b26718b Call ekka_autocluster:bootstrap/0 to build the cluster 2017-07-18 18:40:03 +08:00
Feng Lee 9b646d8cbc Integrage with 'ekka' library 2017-06-16 12:30:09 +08:00
turtled 8d6457996c support bcrypt 2017-04-11 16:02:48 +08:00
Feng Lee 783079cb07 Merge emq20 branch 2017-03-24 13:35:43 +08:00
Feng Lee b54fba2a5d Depend on emqtt/pbkdf2 to resovle the building errors of Travis CI 2017-03-24 12:35:39 +08:00
Feng Lee 181ac36171 Remove the 'erlang-pbkdf2' dep to resolve CI building error 2017-03-24 11:26:42 +08:00
Feng Lee 852c671881 Add goldrush dep 2017-03-24 10:46:52 +08:00
Feng Lee a0c60f11cf Depends on 'emq22' branch 2017-03-22 10:49:09 +08:00
Feng Lee 076b3c0068 Upgrade esockd library to v4.2 2017-03-13 17:10:54 +08:00
Feng Lee 056dc747ad Depend on emq20 branch of esockd library 2017-03-13 14:56:59 +08:00
Feng Lee 05396f0ade Add pbkdf2 dependencies and fix the building errors 2017-03-13 13:30:49 +08:00
Feng Lee d310fff532 Add 'lager_syslog' dependency 2017-02-21 18:46:44 +08:00
Feng Lee a5ba86fd1a Update rebar.config 2017-02-16 11:46:21 +08:00
Drew Varner 8e60b8f00a Remove gen_logger references 2017-01-23 20:02:02 -05:00
Feng Lee ed730f6827 Fix issue#814 - Cannot remove a 'DOWN' node from the cluster 2016-12-12 19:25:49 +08:00
Feng eb9c11f321 remove modules 2016-10-31 20:26:56 +08:00
Feng 3406137433 new config 2016-10-08 18:38:33 +08:00
Feng 52403ceb67 update Makefile 2016-10-02 15:02:49 +08:00
Feng a16802d018 session.subscribed, session.unsubscribed hooks and retainer module 2016-09-08 09:10:45 +08:00
Feng 3e77773d04 generated by erlang.mk 2016-07-19 17:58:31 +08:00
Feng 2e200f253f 2.0 - erlang.mk to replace rebar 2016-07-19 17:46:05 +08:00
Feng Lee c73d299942 gen_logger 2016-05-02 01:05:55 +08:00
Feng Lee f96f209b4a esockd .* 2016-05-02 00:55:59 +08:00
Feng c94f6f30dd ct - emqttd.test.config 2016-03-11 23:48:56 +08:00
Feng 928780f322 common tests 2016-02-16 02:20:29 +08:00
Feng e8c0546525 comment enunit verbose 2016-02-15 11:45:30 +08:00
Feng 775dc10367 compile behaviour module first 2016-01-31 15:30:26 +08:00
Feng 490d7ce175 fix issue #348 -Compilation fails if repo is cloned with a different name 2015-11-04 23:35:50 +08:00
Feng 5aa30f0b1c master 2015-11-04 22:23:20 +08:00
Feng e538d91efc esockd3 2015-11-01 12:47:24 +08:00
Feng f4cf90ae91 refactor client 2015-10-30 16:00:11 +08:00