Commit Graph

2635 Commits

Author SHA1 Message Date
Feng Lee
c8d6e9a012 Update test cases 2017-12-07 16:37:46 +08:00
Feng Lee
a904dfd4f2 Comment the ERTS_MINIMUM macro 2017-12-07 16:26:32 +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
HuangDan
896088b7e8 Router test cases migration from emqttd_SUITE to emqttd_route_SUITE 2017-12-06 21:09:03 +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
9f1c3a5899 Compatible with esockd 4.x 2017-12-06 14:42:26 +08:00
turtled
bcf345efbe Fix compile fail 2017-12-06 10:27:55 +08:00
turtled
ddf2965651 Rm emqttd.app.src 2017-12-06 10:26:19 +08:00
turtled
24f05adb1a Fix compile fail 2017-12-06 10:19:46 +08:00
Feng Lee
c3c5589452 Version 2.3.2 2017-12-06 10:01:42 +08:00
Feng Lee
a86fe1c066
Merge pull request #1376 from emqtt/send_timeout
Add send_timeout, send_timeout_close options
2017-12-06 09:40:03 +08:00
Feng Lee
51533dbe9e Shutdown the connection if an error occurred when sending data 2017-12-05 23:41:40 +08:00
Feng Lee
8e41aeeeb8 Add send_timeout, send_timeout_close options 2017-12-05 19:47:17 +08:00
turtled
a42fcb2c39 Fix conflicts 2017-12-05 16:34:18 +08:00
huangdan
37b7e6aee4
Merge pull request #1369 from emqtt/emq24
Version 2.3.1
2017-12-03 02:20:53 +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
0716b2b2d0 Enable the stats of session by default 2017-12-02 12:13:55 +08:00
Feng Lee
c308037b1a Remove the unnecessary transactions to optimize session management 2017-12-01 17:16:59 +08:00
Feng Lee
d2a4e2c615 Should not exit arbitrarily if clientid conflicts in mnesia 2017-12-01 15:46:42 +08:00
Feng Lee
d9500412bf Update the topic's statistics 2017-12-01 09:10:46 +08:00
Feng Lee
ee5c33d0bd Fix the 'no function clause' exception for issue #1293 2017-11-29 22:23:59 +08:00
Feng Lee
26fb809dbe Fix issue#1293 - the retained flags should be propagated for bridge. 2017-11-29 14:09:46 +08:00
Feng Lee
2611f660de Fix issue #1353 - the management API should listen on 0.0.0:8080 2017-11-29 10:45:40 +08:00
Feng Lee
aaf19787af Remove the duplicated InfoHandler 2017-11-22 18:11:21 +08:00
Feng Lee
99ed0e46b6 Remove RPC args 2017-11-22 17:07:11 +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
845c5eddc1 Merge with emqx 2017-11-21 22:41:02 +08:00
Feng Lee
e52c303014 Merge develop to X 2017-11-21 14:25:35 +08:00
Feng Lee
2cec86eba7 Merge with version 2.3.0 2017-11-21 14:14:12 +08:00
Feng Lee
db3a54e31a Fast close the invalid websocket in init/1 function 2017-11-20 14:15:51 +08:00
Feng Lee
14771cdaee Fix issue #1340 - erlang:demonitor/1 the reference when erasing the monitor 2017-11-20 10:10:32 +08:00
huangdan
cb30f69a13
Merge pull request #1343 from emqtt/emq24
Version 2.3.0
2017-11-19 04:01:04 -06:00
huangdan
6c5d2e7d69
Merge pull request #1325 from emqtt/develop
Version 2.3.0
2017-11-19 00:55:59 -06:00
Feng Lee
d794273bdb Merge the test cases 2017-11-19 14:27:26 +08:00
Feng Lee
6028d6e83e Show local route 2017-11-19 14:25:54 +08:00
HuangDan
2d92f95294 Update the test cases for emqttd 2017-11-19 12:06:55 +08:00
Feng Lee
945f925136 Refactor the subscription_list function 2017-11-19 01:15:22 +08:00
turtled
8462fa8e89 Display local route 2017-11-18 17:21:13 +08:00
Feng Lee
683c74b808 TODO: add more test cases for CLIs 2017-11-18 13:24:28 +08:00
Feng Lee
f01deec950 Update the 'api/v2/subscriptions' API 2017-11-18 13:23:51 +08:00
Feng Lee
1d0e17b89c Improve the print of 'subscriptions' CLI 2017-11-18 12:25:00 +08:00
Feng Lee
d58b8bed3c Fix the 'subscriptions add <ClientId> <Topic> <Qos>' CLI 2017-11-18 11:48:44 +08:00
Feng Lee
405d5d9d29 Fix the 'subscriptions' CLI 2017-11-18 11:17:19 +08:00