Commit Graph

4500 Commits

Author SHA1 Message Date
HuangDan 0f54613c11 Fix Conflicting files 2017-08-12 22:33:24 +08:00
huangdan f7632f4320 Merge pull request #1198 from emqtt/develop
Fix rest_api get monitoring/nodes error
2017-08-12 22:28:10 +08:00
turtled 64af3271c2 Fix rest_api get monitoring/nodes error 2017-08-12 22:00:33 +08:00
Feng Lee 36a7b74656 Merge pull request #1197 from emqtt/develop
Add http management APIs
2017-08-12 13:18:04 +08:00
Feng Lee f28db8b4c7 Format code 2017-08-12 12:51:02 +08:00
HuangDan 8cb07b6299 Update Depends of clique 2017-08-11 17:15:53 +08:00
HuangDan 0c3c1c3788 Add restApi related test case 2017-08-11 15:42:55 +08:00
HuangDan 9b61fea1d1 Update auth spec 2017-08-11 15:40:33 +08:00
turtled fefcfd1481 fix conflicts 2017-08-11 14:57:25 +08:00
turtled f11967288e Add emqttd_broker info API 2017-08-11 14:56:56 +08:00
turtled f4381155f8 Format code 2017-08-11 09:53:06 +08:00
HuangDan ea8ecf2587 Merge branch 'develop' of https://github.com/emqtt/emqttd into develop 2017-08-10 18:30:18 +08:00
HuangDan 51c7c9b688 Add http management APIs tests cases 2017-08-10 18:30:07 +08:00
turtled 701ee3e8dc Add CLI set/get env 2017-08-10 18:19:20 +08:00
turtled 7c1ee6610d Add http management APIs 2017-08-09 10:14:29 +08:00
Feng Lee 1c63bdd90d APIs for hot reload of configuration 2017-08-07 18:28:32 +08:00
Feng Lee 88f84a4a0c Support to configure keepalive backoff 2017-08-07 18:27:16 +08:00
Feng Lee 925e35dcbd Remove the fullsweep_after option 2017-08-07 12:15:52 +08:00
Feng Lee ffebce5090 Depend on develop branch of ekka 2017-07-26 13:58:44 +08:00
Feng Lee 8325056061 Authorize HTTP Publish API with clientId 2017-07-26 13:16:46 +08:00
Feng Lee f25661d3cd Merge pull request #887 from chimit/master
Add ClientId parameter into the auth on HTTP Publish
2017-07-26 13:02:02 +08:00
Feng Lee 2167e26c0d Merge pull request #1164 from emqtt/emq24
Update README - Add emq_auth_jwt, emq_lwm2me Plugins
2017-07-24 15:06:36 +08:00
Feng Lee dc4a1c8720 Merge pull request #1163 from emqtt/develop
Update README - Add emq_auth_jwt and emq_lwm2m Plugins
2017-07-24 15:05:22 +08:00
Feng Lee 617f1fe5b7 Update README - Add emq_auth_jwt and emq_lwm2m Plugins 2017-07-24 14:53:59 +08:00
Feng Lee 471ff5e909 Update README.md 2017-07-24 14:49:38 +08:00
Feng Lee c349567450 Merge pull request #1161 from emqtt/emq24
Fix the 'case clause matching' exception
2017-07-24 09:48:25 +08:00
Feng Lee 2c4d452fa0 Merge pull request #1160 from emqtt/develop
Fix the 'case clause matching' exception
2017-07-24 09:42:40 +08:00
Feng Lee c4464954b0 Fix the 'case clause matching' exception 2017-07-24 09:34:22 +08:00
HuangDan d57fa1a2bb Fix Conflicting files 2017-07-23 21:23:47 +08:00
Feng Lee 0537351eed Merge pull request #1159 from emqtt/develop
Fix the undefined error
2017-07-23 21:21:49 +08:00
Feng Lee 6b0571d76c Fix the undefined error 2017-07-23 20:49:58 +08:00
Feng Lee 74145cf5df Depends on master branch of ekka library 2017-07-23 18:55:21 +08:00
Feng Lee 263a553c50 Depends on emq24 branch of ekka library 2017-07-23 18:53:43 +08:00
Feng Lee 04166ff891 Merge pull request #1157 from emqtt/emq24
Version 2.3 - Autocluster and Autoheal
2017-07-23 18:50:33 +08:00
Feng Lee 156d0a1771 Merge pull request #1156 from emqtt/develop
Version 2.3
2017-07-23 18:47:14 +08:00
Feng Lee 09b4f17065 Merge the configuration of ekka 2017-07-23 18:42:54 +08:00
Feng Lee 15a081c9bb Improve the Autocluster design 2017-07-23 18:07:53 +08:00
HuangDan c83b9e6124 Depends on the ekka_mnesia module 2017-07-23 12:41:44 +08:00
turtled 6350337d1d Set cluster.discovery default by mcast 2017-07-22 10:09:53 +08:00
Feng Lee 081717be92 Add autocluster lock 2017-07-21 15:44:38 +08:00
Feng Lee c1bce429d9 Load plugins after autocluster 2017-07-21 13:07:04 +08:00
Feng Lee 041b9100ed Merge configurations of ekka library 2017-07-21 12:52:26 +08:00
Feng Lee 96777a4da8 Start listeners after autocluster 2017-07-21 12:43:28 +08:00
Feng Lee 7f22265e31 Use global:trans/2 to clean routes and sessions 2017-07-20 14:22:18 +08:00
Feng Lee 8277707c1b node.dist_listen_max = 6379 2017-07-18 19:03:45 +08:00
Feng Lee d6d08d6d5e Ensure to start ekka 2017-07-18 18:49:38 +08:00
Feng Lee 437b26718b Call ekka_autocluster:bootstrap/0 to build the cluster 2017-07-18 18:40:03 +08:00
Feng Lee a23df7f16e Support autocluster with IP Multicast 2017-07-18 18:39:02 +08:00
Feng Lee 0a7ca2cdb3 Depends on ekka 0.2 develop branch 2017-07-18 18:37:52 +08:00
HuangDan e3018146e7 Remove invalid test cases 2017-07-12 20:20:47 +08:00