Commit Graph

2549 Commits

Author SHA1 Message Date
Feng Lee
b19479cd3a Merge pull request #1255 from emqtt/develop
Remove rebar.config to fix the building error of travis CI
2017-09-13 07:46:09 +08:00
Feng Lee
16eef90707 Remove rebar.config 2017-09-13 07:43:02 +08:00
Feng Lee
0745816c49 Merge pull request #1245 from BerkOzdilek/develop
Fixed broken emq_modules plugin URL on README
2017-09-13 01:12:49 +08:00
huangdan
824a9a3797 Merge pull request #1252 from emqtt/develop
Fix string:split undefined issue
2017-09-12 21:58:09 +08:00
turtled
e57121a660 Fix string:split undefined issue 2017-09-12 21:34:43 +08:00
huangdan
a920906613 Merge pull request #1248 from emqtt/develop
Update clean_acl_cache API
2017-09-12 11:20:05 +08:00
turtled
f6025404e3 Update clean_acl_cache API 2017-09-12 10:57:04 +08:00
HuangDan
072b444e9f Fixed Conflicting files 2017-09-11 22:07:12 +08:00
berk ozdilek
ed58b054e9 Fixed broken emq_modules plugin URL on README
Updated README, changed broken url with correct one(there was a typo) for emq_modules plugin
2017-09-11 15:00:48 +03:00
turtled
ee9fc5cb0e Review code 2017-09-09 21:21:30 +08:00
turtled
424aea2878 Review code 2017-09-09 21:00:17 +08:00
turtled
8091c07d3c Review code 2017-09-09 20:55:57 +08:00
turtled
85f9a8cb70 Fix read plugin configuration not find schema file 2017-09-08 23:23:48 +08:00
turtled
7260b17cb5 Plugins configuration insert to ets table 2017-09-06 17:17:29 +08:00
turtled
d3f52898ee Add Hot configuration plugin 2017-09-05 16:52:07 +08:00
Feng Lee
0c3f10ef07 Merge pull request #1223 from emqtt/issue#1221
Remove rebar.config to fix issue#1221
2017-08-28 17:36:31 +08:00
Feng Lee
68efc71093 Remove rebar.config to fix the building error of CI 2017-08-28 17:32:04 +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
1f50229dff Call 'make deps' before 'rebar get-deps' 2017-08-28 12:19:09 +08:00
HuangDan
a20b7005be Merge branch 'develop' of https://github.com/emqtt/emqttd into develop 2017-08-23 21:47:14 +08:00
HuangDan
947df6ce35 Add test cases for topic match 2017-08-23 21:45:11 +08:00
Feng Lee
88f7e71f29 Update rebar.config 2017-08-23 11:08:03 +08:00
Feng Lee
363928505a Depends on Erlang/OTP R20 2017-08-23 10:04:45 +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
ab0b5cca78 Merge pull request #1213 from emqtt/develop
Update REST API
2017-08-21 16:48:21 +08:00
turtled
ed29c3273d Review code 2017-08-21 16:16:28 +08:00
turtled
9a4a6885d9 Update api list 2017-08-21 15:09:45 +08:00
huangdan
86892fd016 Merge pull request #1212 from emqtt/develop
REST API add modify_config/config_list
2017-08-21 13:56:10 +08:00
turtled
5bec24d19b Update modify_config url 2017-08-18 23:28:33 +08:00
turtled
f6b9ce84e5 Update kick_client API 2017-08-18 11:44:11 +08:00
getong
087f51e018 add erlang 20 2017-08-17 11:42:19 +00:00
turtled
aeec7804f9 Fix conflicts 2017-08-17 15:52:17 +08:00
turtled
9e6c63b91b REST API add modify_config/config_list 2017-08-17 15:51:20 +08:00
HuangDan
38008cf09c Fixed test cases for hot configuration 2017-08-16 16:50:24 +08:00
turtled
d50ce9f6c0 Fix compile warning 2017-08-16 12:10:46 +08:00
turtled
83a42a717d fix conflicts 2017-08-16 11:25:46 +08:00
turtled
4ff7d4eead Fix ctl set env fail 2017-08-16 11:25:11 +08:00
HuangDan
75c6348cf5 Added more test cases for hot configuration 2017-08-16 03:07:30 +08:00
turtled
34e5d746d1 Fix compile fail 2017-08-15 12:33:09 +08:00
turtled
303db5ccbd Add clean_acl_cache API 2017-08-15 12:18:31 +08:00
Feng Lee
5dc451b809 Merge pull request #1205 from emqtt/emq24
Update .gitignore
2017-08-14 09:58:22 +08:00
Feng Lee
2f7379583e Merge pull request #1204 from emqtt/develop
Remove 'docs/*', 'examples/*' folders from .gitignore
2017-08-14 09:57:06 +08:00
Feng Lee
37ba47365c Remove 'docs/*', 'examples/*' folders from .gitignore 2017-08-14 09:54:45 +08:00
Feng Lee
1ef47cc0fe Merge pull request #1203 from emqtt/develop
Add test case for hot configuration
2017-08-14 09:38:31 +08:00
Feng Lee
a22ecaf1f1 Merge pull request #1202 from emqtt/develop
Add test case for hot configuration
2017-08-14 09:37:36 +08:00
Feng Lee
7494aee126 Add more test cases for hot configuration 2017-08-14 09:33:04 +08:00
Feng Lee
f978bae86a TODO: How to persist the configuration 2017-08-14 09:32:39 +08:00
HuangDan
0f54613c11 Fix Conflicting files 2017-08-12 22:33:24 +08:00