Commit Graph

266 Commits

Author SHA1 Message Date
Feng Lee cbbc231210 Comment log.syslog.* to fix building issue 2018-07-19 10:08:37 +08:00
Feng Lee e2a34ec98d Comment lager syslog to be compatible with Erlang/OTP R21 2018-07-19 09:34:49 +08:00
Feng Lee 7ee54aac28 Add 'qos' field to message record 2018-07-18 23:41:00 +08:00
Feng Lee b3adcc8971 Add RPC Args 2018-07-18 14:24:35 +08:00
Feng Lee bbe56dabec Fix whitespace 2018-04-25 15:37:30 +08:00
Feng Lee f4fd6efe16 Merge the emqx-common, emqx-router libraries 2018-02-26 23:29:53 +08:00
Feng Lee 057ef7b668 Merge branch 'master' 2018-02-26 01:05:08 +08:00
Feng Lee fcb2ec8427 Merge the latest enterprise branch 2018-02-24 15:56:32 +08:00
Feng Lee b63c34ab14 Merge the latest master branch 2018-02-24 11:27:09 +08:00
Feng Lee bcec25092b Merge version 2.3.2 to X edition 2017-12-26 21:09:24 +08:00
Feng Lee f1640f5b85 Merge emq24 to X branch 2017-12-07 11:02:44 +08:00
turtled a42fcb2c39 Fix conflicts 2017-12-05 16:34:18 +08:00
Feng Lee 99ed0e46b6 Remove RPC args 2017-11-22 17:07:11 +08:00
Feng Lee 2cec86eba7 Merge with version 2.3.0 2017-11-21 14:14:12 +08:00
Feng Lee 2354a3dd5d Fix the building errors 2017-10-10 15:50:40 +08:00
Feng Lee 4b8cd18f5d Merge with EMQ X project 2017-10-09 19:43:06 +08:00