Commit Graph

4484 Commits

Author SHA1 Message Date
Feng Lee d4d234ca86
Merge pull request #1429 from mingchuno/fix-broken-readme-link
fix wrong emq-retainer link in README
2018-01-07 15:17:01 +08:00
Feng Lee bfa9fc675c
Merge pull request #1420 from HJianBo/issue_1216
Fix issue #1216
2018-01-07 14:02:54 +08:00
Feng Lee 8df524c19a
Merge pull request #1438 from emqtt/develop
Version 2.3.3 - Improve documentation and bug fix
2018-01-07 12:55:24 +08:00
Feng Lee fde905d754
Merge branch 'emq24' into develop 2018-01-07 12:53:30 +08:00
Feng Lee 4e7a12a838 Fix #1430 - update the link to emqx-lwm2m project 2018-01-06 15:46:43 +08:00
Feng Lee a779c9f9cb Add 'listener.wss.external.tls_versions' option 2018-01-04 20:25:26 +08:00
Feng Lee fdc55de509 Change the type of 'mqtt.bridge.ping_down_interval' to ms duration 2018-01-04 16:09:45 +08:00
Feng Lee 86fc80b983 Change the type of 'mqtt.broker.sys_interval' to ms duration 2018-01-04 16:09:10 +08:00
Feng Lee 3a39706d84 Add more options for 'listener.wss.' 2018-01-04 16:05:44 +08:00
Feng Lee b98a320124 Improve documentation for all options 2018-01-04 15:32:21 +08:00
Feng Lee b2b78c178c Add documenation for SSL configurations 2018-01-04 12:25:05 +08:00
mingchun.or 0076032815 fix wrong link in emq-retainer 2018-01-04 11:36:33 +08:00
Feng Lee d26e746f5d Merge branch 'develop' of github.com:emqtt/emqttd into develop 2018-01-03 22:49:58 +08:00
Feng Lee a17fae30e2 Add more documentation for MQTT listeners 2018-01-03 22:44:54 +08:00
turtled 0a7e93ea90 Export funtion fix #1428 2018-01-03 10:29:51 +08:00
turtled ad26eff421 Format print log 2018-01-03 10:27:51 +08:00
Feng Lee 052f9638cb Add more documentation for emq.conf 2018-01-02 20:47:25 +08:00
Feng Lee 10ed4219db Update documentation for R2 configurations 2017-12-31 15:10:45 +08:00
HeeeJianBo 5fbbff46b1 Fix issue #1216, redeliver pubrel packet now 2017-12-28 17:57:32 +08:00
Feng Lee 953a7628a3 Version 2.3.3 2017-12-28 11:34:29 +08:00
Feng Lee ed5e4d1857 Change the default value of mqtt.keepalive_backoff to 0.75 2017-12-27 21:30:17 +08:00
Feng Lee d8f78c885d
Merge pull request #1418 from HJianBo/develop
Fix issue #1398
2017-12-27 15:18:16 +08:00
HeeeJianBo 4c8b43e05d Improve impletament of emqttd_topic:match/2 2017-12-27 15:11:55 +08:00
HeeeJianBo d5c54276e2 Fix issue #1398 2017-12-27 14:55:36 +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
Feng Lee 985ab723df Support for zone configuration 2017-12-26 21:01:03 +08:00
huangdan 1f2de7492c
Merge pull request #1411 from emqtt/emq24
Version 2.3.2
2017-12-26 00:45:59 +08:00
HuangDan 5aef79b1ad Fixed Conflicting files 2017-12-26 00:44:45 +08:00
Feng Lee a5c9c3c15d Update Makefile 2017-12-25 20:39:50 +08:00
Feng Lee d5222dcc9b Add proxy_protocol, proxy_protocol_timeout options for ws/wss 2017-12-25 20:38:09 +08:00
HuangDan d7e56fa971 Upgrade the esockd library to v5.2 2017-12-25 17:31:23 +08:00
Feng Lee db954aeb6d Support X.509 certificate based authentication with HAProxy 2017-12-15 19:23:50 +08:00
Feng Lee 6f64eb469c Remove emqttd_ssl.erl 2017-12-07 17:58:24 +08:00
Feng Lee b98007659e Merge the master branch 2017-12-07 17:57:18 +08:00
Feng Lee f452469bc5
Merge pull request #1388 from emqtt/emq24
Version 2.3.2 - Support for X.509 certificate based authentication
2017-12-07 17:53:58 +08:00
Feng Lee a728d91cd0
Merge pull request #1387 from emqtt/develop
Support for X.509 certificate authentication
2017-12-07 17:52:04 +08:00
Feng Lee 80e248d753
Merge pull request #1382 from emqtt/master
Merge the master branch to X
2017-12-07 17:48:36 +08:00
Feng Lee ab6eb500ac
Merge pull request #1386 from emqtt/peer_cert_as_username
Support for TLS with client certificate based authentication
2017-12-07 17:45:40 +08:00
Feng Lee 73836939c8 Support for TLS with client certificate based authentication 2017-12-07 17:42:32 +08:00
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 85124242df Merge branch 'emq24' 2017-12-06 21:23:38 +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