yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,511 Commits 393 Branches 684 Tags 74 MiB
Commit Graph

20511 Commits

Author SHA1 Message Date
Lei Chen ff6acbf293 Client unsubscribe hook does not handle 'stop' value. 
Insert a statement to prevent calling emqttd_session:unsubscribe() if hook returns stop.
 2017-01-16 16:24:19 +08:00
Feng Lee 448176c504 Merge pull request #857 from emqtt/emq20 
Replace the 'runner_' variables with 'platform_'
 2017-01-12 12:26:07 +08:00
Feng Lee 72ed291947 Replace the 'runner_' variables with 'platform_' 2017-01-12 11:56:30 +08:00
turtleDeng d62a374cc1 Merge pull request #856 from emqtt/emq20 
Support variables in etc/emq.conf: {{ runner_etc_dir }}, {{ runner_etc_dir }}, {{ runner_data_dir }}
 2017-01-12 11:20:00 +08:00
Feng Lee a5de6d0d1a Merge branch 'master' into emq20 2017-01-12 11:01:17 +08:00
turtled 96d053dbd1 Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20 2017-01-12 10:54:02 +08:00
Feng Lee 0cd4afaa8e Merge pull request #855 from emqtt/emq20 
Copyright (c) 2016-2017
 2017-01-12 10:49:06 +08:00
黄丹 101532980b Update emqttd_pmon.erl 
Copyright (c) 2016-2017
 2017-01-11 21:38:34 +08:00
Feng Lee 6af4badc0a Merge pull request #854 from emqtt/emq20 
Copyright (c) 2012-2017
 2017-01-11 21:12:52 +08:00
Feng Lee 56992cd48b Bump version to 2.0.7 2017-01-11 19:36:38 +08:00
huangdan 8092543efb Copyright (c) 2012-2017 2017-01-11 19:34:48 +08:00
turtled b892bc703b vars template emq.conf 2017-01-11 19:05:42 +08:00
Feng Lee 21576319d6 Merge branch 'emq20' into proxy-protocol 2017-01-11 15:29:47 +08:00
Feng Lee 9e0d8de37c Bump version to 2.0.7 2017-01-11 15:29:24 +08:00
huangdan 2e966a8cbd Mod Copyright (c) 2012-2017 2017-01-11 13:24:40 +08:00
Feng Lee 42d9e78b21 Merge pull request #851 from emqtt/emq20 
Version 2.0.6
 2017-01-08 16:08:11 +08:00
Feng 435d91c111 Version 2.0.6 2017-01-07 18:37:24 +08:00
Feng Lee 2d3d8a6d3a Merge pull request #837 from chimit/patch-1 
Change "ok" message to uppercase
 2016-12-27 18:12:40 +08:00
Chimit 06ca13531e Change "ok" message to uppercase 2016-12-27 17:21:27 +08:00
Feng Lee dc44c685cd Merge pull request #832 from emqtt/emq20 
2.0.5
 2016-12-23 15:51:31 +08:00
Feng Lee 9f56370f6b 2.0.5 2016-12-20 11:40:53 +08:00
Feng Lee f51007be32 Merge pull request #822 from emqtt/emq20 
2.0.4 - Test cases for SSL connections
 2016-12-14 21:31:02 +08:00
huangdan d7c5706b17 code review 2016-12-14 21:00:50 +08:00
Feng Lee 39c35c79de 2.0.4 2016-12-14 19:23:22 +08:00
huangdan 421ae007e8 code format 2016-12-14 19:15:32 +08:00
huangdan 4c9e031ece code format 2016-12-14 19:14:03 +08:00
huangdan b9220490bf code format 2016-12-14 19:11:37 +08:00
turtled 4aed3abb5e Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20 2016-12-14 18:10:00 +08:00
turtled 737a89d5e8 rm net_adm:ping 2016-12-14 18:09:41 +08:00
huangdan 776e6d9266 sslmut ct 2016-12-14 16:55:05 +08:00
huangdan aa46cc0145 ssl-oneway ct 2016-12-14 13:45:59 +08:00
turtled 15a2b265be fixed cluster fail 2016-12-13 16:57:18 +08:00
Feng Lee bd2d085401 Merge pull request #818 from emqtt/emq20 
Fix #413 again...
 2016-12-13 16:01:46 +08:00
turtled 696647f2cf fixed #413 2016-12-13 15:57:22 +08:00
Feng Lee b640c40b6c Merge branch 'emq20' 2016-12-13 10:57:55 +08:00
Feng Lee 8c1f5d7ec1 Unauthorized 2016-12-13 10:27:05 +08:00
Feng 05b757f6ae Merge branch 'emq20' 2016-12-12 23:16:44 +08:00
Feng ce2261d446 Version 2.0.3 2016-12-12 23:10:34 +08:00
turtleDeng b7b208229d Merge pull request #815 from emqtt/emq20 
Fix issue#814 - Cannot remove a 'DOWN' node from the cluster
 2016-12-12 20:07:37 +08:00
Feng Lee ed730f6827 Fix issue#814 - Cannot remove a 'DOWN' node from the cluster 2016-12-12 19:25:49 +08:00
Feng Lee b379c18486 Merge pull request #813 from chimit/master 
Change parameters order
 2016-12-10 20:01:52 -08:00
Chimit 58046016f0 Change parameters order 2016-12-10 13:29:37 +08:00
Feng Lee 47a8a6ed53 Merge pull request #810 from emqtt/emq20 
Print shared subscriptions
 2016-12-09 16:48:40 +08:00
huangdan fa99cdcaa5 Local Subscription Routes show 2016-12-08 19:34:38 +08:00
huangdan 470a933938 Shared Subscription CLI 2016-12-08 18:06:48 +08:00
Feng Lee 7abc667f7d iolist_size/1 2016-12-07 19:15:44 +08:00
Feng Lee 4399a5d641 Merge pull request #802 from emqtt/emq20 
iolist_size/1
 2016-12-07 19:13:53 +08:00
Feng Lee 49ebed5b0b iolist_size 2016-12-07 18:37:47 +08:00
Feng Lee 18af7540ad Merge pull request #800 from emqtt/emq20 
iolist_size
 2016-12-07 18:35:33 +08:00
Feng Lee 686eb739d9 Merge pull request #797 from emqtt/emq20 
fix issue#796
 2016-12-06 15:30:05 +08:00