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

5771 Commits

Author SHA1 Message Date
Zaiming Shi 237998bba4
Merge pull request #4117 from zmstone/merge-4.3-alpha.1-to-5.0 
Merge 4.3 alpha.1 to 5.0
 2021-01-29 15:15:37 +01:00
Zaiming Shi 4e19e99ec4 Merge tag 'v4.3-alpha.1' into merge-4.3-alpha.1-to-5.0 2021-01-29 15:12:37 +01:00
Zaiming Shi fc14e86829
Merge pull request #4116 from z8674558/merge430 
merge 4.3.0 to 5.0
 2021-01-29 14:46:47 +01:00
wwhai a3206f5e0b fix(rule-engine): reformat code style 2021-01-29 19:32:05 +08:00
JianBo He 38eb849ef0 fix(mysql): upgrade mysql to 1.7.1 for TLS supporting 2021-01-29 19:31:02 +08:00
zhanghongtong d78b2b23c1 chore(build): update pkg version 2021-01-29 19:29:41 +08:00
JianBo He 1aefee01c2 chore(mgmt): remove needless lines 2021-01-29 18:50:29 +08:00
z8674558 a6e532779b chore(mongo): quote example 2021-01-29 18:21:34 +09:00
z8674558 fd1a53b45e fix(cts): fix config file path in sed 2021-01-29 18:21:29 +09:00
wwhai 3973c93534 fix(rule-engine): remove unused code 2021-01-29 17:16:00 +08:00
z8674558 e8729fb00e Merge branch 'dev/v5.0' of private:emqx/emqx into merge430 2021-01-29 17:11:12 +09:00
Zaiming Shi 5b4c886b16
Merge pull request #4107 from emqx/resove-master-to-4.3-conflict 
Auto-pull-request-on-2021-01-29
 2021-01-29 08:34:35 +01:00
Zaiming Shi 02fb66f4ce
Merge branch 'dev/v4.3.0' into resove-master-to-4.3-conflict 2021-01-29 08:33:20 +01:00
Zaiming Shi 9140eafd94 chore(docker): Start emqx in foreground mode in docker container 2021-01-29 15:30:32 +08:00
Zaiming Shi 64e7056f3f chore(script): Add a help script to test clustering with docker 2021-01-29 15:30:32 +08:00
wwhai 7072355bc1 fix(rule-engine): fix test failure 2021-01-29 15:24:07 +08:00
wwhai 73655369af fix(rule-engine): reformat some code 2021-01-29 11:52:32 +08:00
Zaiming Shi d13a33463f chore(bin/emqx): set program name 2021-01-29 09:42:35 +08:00
Zaiming Shi cf23d9efe9 chore(bin/emqx): Do not rely on beam.smp program name 2021-01-29 09:42:35 +08:00
tigercl 730d09f874
fix(http): upgrade ehttpc to 0.1.2 (#4093) 
For fix the connection closed by keepalive
 2021-01-29 09:35:08 +08:00
zhanghongtong 472b8bf42e chore(CI): cancel the tls test for mysql 2021-01-28 21:23:41 +08:00
zhanghongtong 3a0f6a68be chore(docker): fix some error 2021-01-28 21:23:41 +08:00
tigercl 5878950dc3
feat(websocket): support for checking subprotocols (#4099) 2021-01-28 20:42:57 +08:00
Zaiming Shi 469afbd8bb chore(docker): update to use alpine 3.12 
3.12 is our builder image base
 2021-01-28 20:32:03 +08:00
Zaiming Shi 5d5617a911 chore(docker): Update port export discriptions 2021-01-28 20:32:03 +08:00
wwhai f0993c6b0f
chore(style): improve the codes style 2021-01-28 20:01:59 +08:00
zhanghongtong 6a83cf3f35 chore(format): format some code 2021-01-28 19:18:18 +08:00
CrazyWisdom e283a3d165 docs(README.md): update Community section 2021-01-28 17:12:17 +08:00
CrazyWisdom af73516c59 docs(README.md): update Community section 2021-01-28 17:03:20 +08:00
JianBo He 456e3e5faa chore(bridge-mqtt): fix styles 2021-01-28 16:24:42 +08:00
JianBo He d98d26942c fix(bridge-mqtt): add max_inflight_size option back 
For compatibility with versions below 4.2, we still
use the `max_inflight_size` option, but generate it
as the `max_inflight`

Previous PR: https://github.com/emqx/emqx/pull/3938
 2021-01-28 16:24:42 +08:00
JianBo He 9d465ac81f chore(deps): upgrade replayq to 0.3.1 2021-01-28 16:24:42 +08:00
Zaiming Shi e96d03dc1b
Merge pull request #4087 from zmstone/fix-auth-ldap 
fix(auth_ldap): do not load plugin when no params configured
 2021-01-28 08:51:08 +01:00
Zaiming Shi 903eadad57 fix(ci): wait for emqx in mac test 2021-01-27 23:18:49 +01:00
Zaiming Shi c422b200be
Merge pull request #4088 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-01-27
 2021-01-27 22:02:52 +01:00
Zaiming Shi d38b626579 fix(emqx_coap_ps_resource): Copy uri decode code from OTP-22 2021-01-27 19:19:38 +01:00
zhouzb e6235d3bc9 fix(scheme): fix default scheme 2021-01-27 19:11:41 +01:00
zhouzb 92d307b1b3 fix(scheme): update test case 2021-01-27 19:11:41 +01:00
zhouzb 45aafc75dd fix(scheme): using uri_string:normalize/1 2021-01-27 19:11:41 +01:00
zhouzb 311df2f8a6 fix(scheme): fix scheme parsing 2021-01-27 19:11:41 +01:00
zhouzb a631a2d64f fix(ssl): fix ssl option 2021-01-27 19:11:41 +01:00
Zaiming Shi f42e52e84e fix(auth_pgsql): Add back econnrefused error clause 2021-01-27 19:10:47 +01:00
wwhai b5c435e211 fix(rule-engine): add format space 2021-01-27 19:01:11 +01:00
Zaiming Shi fc71285c3f fix(auth_ldap): do not load plugin when no params configured 2021-01-27 12:56:13 +01:00
zhanghongtong 689b530b4f chore(auth-http): remove needless test case 2021-01-27 19:55:21 +08:00
JianBo He b77ac247eb chore(auth-http): remove needless lines 2021-01-27 19:55:21 +08:00
zhanghongtong eaa7394554 chore(ldap): delete uesless dir 2021-01-27 18:58:35 +08:00
JianBo He 02cb8d0211 chore(style): set warnings_as_errors compile option 2021-01-27 18:02:12 +08:00
zhanghongtong fc3ebf41fa fix(docker): fix docker entryponit script 
remove useless environmental variables

update the key of the environment variable

fix issue #4011
 2021-01-27 18:01:50 +08:00
wwhai 001a89a396
Merge pull request #4070 from wwhai/fix-update-problem 
feat(rule-engine): change init resource to test resource
 2021-01-27 17:09:37 +08:00