Commit Graph

32 Commits

Author SHA1 Message Date
turtled a125236220 fix windows branch conflicts 2017-03-31 14:47:25 +08:00
turtled d8d96c1c6e fix windows branch conflicts 2017-03-31 14:44:13 +08:00
Feng 53572b7d37 Fix the comments of mqtt.session.* configurations 2017-02-24 20:38:35 +08:00
huangdan 71eaf285f7 Merge branch 'master' into windows 2017-02-24 11:06:03 +08:00
Feng Lee edd99dc5ed Disable the force GC if conn_force_gc_count = 0 2017-02-23 18:53:16 +08:00
Feng Lee 124aa454fb Add 'mqtt.conn.force_gc_count' config to tune GC of MQTT connection 2017-02-23 16:53:47 +08:00
Feng Lee 8e7ea09cbd Tune the mqtt.client|session.enable_stats off 2017-02-22 17:34:00 +08:00
Feng Lee ff60578a7d Change the datatype of 'enable_stats' to 'flag' 2017-02-21 18:46:10 +08:00
turtled 9468f71c2f create windows branch 2017-02-20 19:21:28 +08:00
Feng Lee a52754df56 Add 'syslog' config and update client, session config 2017-02-16 10:51:03 +08:00
Feng Lee 72ed291947 Replace the 'runner_' variables with 'platform_' 2017-01-12 11:56:30 +08:00
Feng Lee a5de6d0d1a Merge branch 'master' into emq20 2017-01-12 11:01:17 +08:00
turtled b892bc703b vars template emq.conf 2017-01-11 19:05:42 +08:00
Chimit 58046016f0 Change parameters order 2016-12-10 13:29:37 +08:00
Feng Lee 4af9a47f84 add mqtt.cache_acl option 2016-11-11 11:45:26 +08:00
Feng Lee 06f5c8e2b7 Fix #754 - "-heart" option for EMQ 2.0 2016-11-09 09:53:29 +08:00
Feng Lee 4bafcfa7a2 open https port: 8084 2016-11-08 13:49:59 +08:00
turtled 186d512038 fixed ssl opts fail_if_no_peer_cert 2016-11-07 13:40:52 +08:00
turtled 3db876781b handshake_timeout change 2016-11-03 11:04:57 +08:00
Feng eb9c11f321 remove modules 2016-10-31 20:26:56 +08:00
turtled ccfabcfd0d ssl handshake_timeout 2016-10-31 16:49:37 +08:00
turtled 3ab93e0e46 fixed ssl params 2016-10-26 11:50:04 +08:00
Feng 27bc669bee WebSocket 2016-10-18 11:02:40 +08:00
Feng Lee 8fb3a9a90c fix some comments 2016-10-17 13:22:08 +08:00
Feng Lee 3207bf47ec etc/certs 2016-10-16 13:17:31 +08:00
Feng Lee 13c1fa8abf add mqtt.acl_file config, and rm '#seconds' 2016-10-15 13:49:12 +08:00
Feng Lee 96fd3c4ed8 https listener 2016-10-14 16:10:07 +08:00
Feng Lee 7ac3416d51 modules 2016-10-14 14:25:21 +08:00
Feng Lee 9f391f1542 Improve listener config 2016-10-14 10:49:40 +08:00
Feng Lee 73659208a1 allow_anonymous 2016-10-13 19:09:49 +08:00
Feng Lee a01f642606 mqtt listeners 2016-10-13 17:37:32 +08:00
Feng Lee e26ed33f7f rename emqttd.conf -> emq.conf 2016-10-12 19:30:34 +08:00