Commit Graph

151 Commits

Author SHA1 Message Date
terry-xiaoyu
c0fb5f3186 update gen_rpc 2018-08-27 19:28:54 +08:00
turtled
91eb79967c Add syslog 2018-08-27 13:50:38 +08:00
HuangDan
e3fb147594 Fixed test case compilation error 2018-08-26 22:25:54 +08:00
Feng Lee
09b5535260 Depends on cowboy 2.4.0 2018-08-09 15:17:42 +08:00
turtled
4d9e03a803 Refactor websocket conn using cowboy 2018-08-08 18:36:14 +08:00
Feng Lee
1735786ffb Remove pbkdf2 lager_syslog bcrypt deps 2018-07-18 23:30:16 +08:00
Feng Lee
b110a154ef Upgrade header files for EMQ X 3.0 2018-07-18 14:27:11 +08:00
Feng Lee
1de94b6858 Register the default ACL module in emqx_access_control 2018-06-21 22:40:30 +08:00
Feng Lee
22350f9117 Depends on canel-lock library 2018-03-09 13:26:46 +08:00
Feng Lee
b144363f1e Depends on jsx 2.9.0 and gproc 0.7.0 2018-03-03 09:07:45 +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
06b8db1967
Merge branch 'emq24' into develop 2018-02-01 12:20:43 +08:00
Feng Lee
0dac7a2708 Version 2.3.5 - depends on the 'develop' branch of esockd, ekka and mochiweb 2018-02-01 12:18:49 +08:00
Feng Lee
4727acad14 Depends on esockd v5.2.1, mochiweb v4.2.2 2018-02-01 12:13:46 +08:00
Feng Lee
b9dcccd7f7 Version 2.3.4 2018-01-23 15:20:35 +08:00
Feng Lee
fde905d754
Merge branch 'emq24' into develop 2018-01-07 12:53:30 +08:00
Feng Lee
953a7628a3 Version 2.3.3 2017-12-28 11:34:29 +08:00
Feng Lee
6d2483d6c0 Merge develop branch to emq24 2017-12-26 22:17:38 +08:00
Feng Lee
013cc9705e Depends on ekka v0.2.1 2017-12-26 22:15:09 +08:00
Feng Lee
bcec25092b Merge version 2.3.2 to X edition 2017-12-26 21:09:24 +08:00
HuangDan
5aef79b1ad Fixed Conflicting files 2017-12-26 00:44:45 +08:00
HuangDan
d7e56fa971 Upgrade the esockd library to v5.2 2017-12-25 17:31:23 +08:00
Feng Lee
6e5134a8b2 Merge with the enterprise edition 2017-12-07 16:24:48 +08:00
Feng Lee
f1640f5b85 Merge emq24 to X branch 2017-12-07 11:02:44 +08:00
HuangDan
ceafaad6b7 Update deps branch 2017-12-06 21:22:36 +08:00
HuangDan
921dba4eb4 Merge branch 'develop' into emq24 2017-12-06 21:20:30 +08:00
Feng Lee
0ba8d3e11d Depends on develop branch of esockd and mochiweb 2017-12-06 20:13:27 +08:00
huangdan
b5c063f3cb
Merge pull request #1379 from emqtt/develop
Version 2.3.2
2017-12-06 15:52:55 +08:00
HuangDan
4c52d99706 Fixed test cases for emqttd_router_SUITE 2017-12-06 15:47:46 +08:00
Feng Lee
c3c5589452 Version 2.3.2 2017-12-06 10:01:42 +08:00
huangdan
e3161619c6
Merge pull request #1367 from emqtt/develop
Version 2.3.1
2017-12-03 00:54:07 +08:00
HuangDan
b8e0a4d5c4 Bump version to 2.3.1 2017-12-03 00:43:42 +08:00
Feng Lee
223f3d4da5 Remove RPC configurations 2017-11-22 16:44:00 +08:00
Feng Lee
38c33e9c8b Merge with emqx 2017-11-21 22:41:05 +08:00
Feng Lee
2cec86eba7 Merge with version 2.3.0 2017-11-21 14:14:12 +08:00
huangdan
6c5d2e7d69
Merge pull request #1325 from emqtt/develop
Version 2.3.0
2017-11-19 00:55:59 -06:00
HuangDan
2d92f95294 Update the test cases for emqttd 2017-11-19 12:06:55 +08:00
Feng Lee
62d4f9f031 Bump version to 2.3.0 2017-11-17 20:53:07 +08:00
Feng Lee
4b8cd18f5d Merge with EMQ X project 2017-10-09 19:43:06 +08:00
Feng Lee
e1816a5682 Remove rebar.config to fix the building error of CI 2017-08-28 17:31:38 +08:00
Feng Lee
b5f741391b Add 'make autopatch' to fix the building error of travis CI 2017-08-28 15:01:50 +08:00
Feng Lee
12fb31f2f6 Merge pull request #1208 from getong/add_erlang_20
add erlang 20
2017-08-23 10:03:06 +08:00
huangdan
0a1ad99c88 Merge pull request #1214 from emqtt/emq24
Version 2.3-beta.3
2017-08-21 16:49:17 +08:00
HuangDan
75c6348cf5 Added more test cases for hot configuration 2017-08-16 03:07:30 +08:00
HuangDan
0f54613c11 Fix Conflicting files 2017-08-12 22:33:24 +08:00
HuangDan
8cb07b6299 Update Depends of clique 2017-08-11 17:15:53 +08:00
turtled
701ee3e8dc Add CLI set/get env 2017-08-10 18:19:20 +08:00
Feng Lee
ffebce5090 Depend on develop branch of ekka 2017-07-26 13:58:44 +08:00
Feng Lee
74145cf5df Depends on master branch of ekka library 2017-07-23 18:55:21 +08:00