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

6540 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi fb5cda1642 buid: use rockylinux and 'rhel' for package names 2022-02-09 14:06:36 +01:00
lafirest 674752dcb3
Merge pull request #6937 from lafirest/fix/trap_exit 
fix(emqx_slow_subs): trap the exit message
 2022-02-09 09:43:18 +08:00
Zaiming (Stone) Shi 5e7d40fd23
Merge pull request #6941 from savonarola/rebar3-vs-make-4.4 
[4.4] Rebar3 vs make
 2022-02-08 15:24:36 +01:00
Ilya Averyanov c1d2be3bff Merge branch 'main-v4.3' into rebar3-vs-make-4.4 
* main-v4.3:
  chore(ci): use make apps/emqx_auth_ldap-ct instead of rebar command
 2022-02-08 14:48:19 +03:00
Ilya Averyanov ca5c34ba96
Merge pull request #6932 from savonarola/rebar3-vs-make-4.3 
chore(ci): use make apps/emqx_auth_ldap-ct instead of rebar command
 2022-02-08 14:38:20 +03:00
lafirest 252514bfe0 fix(emqx_slow_subs): trap the exit message 2022-02-08 18:28:00 +08:00
zhongwencool 4a6ddce43c
Merge pull request #6926 from zhongwencool/trace-crash 
fix(trace): don't return 500 when emqx_mod_trace not started.
 2022-02-08 15:45:27 +08:00
zhongwencool bcb15f2a95 fix(trace): don't return 500 when emqx_mod_trace not started. 2022-02-08 14:56:02 +08:00
zhongwencool 59ff3090f4
Merge pull request #6935 from zhongwencool/sync-v4.3-to-v4.4 
Sync v4.3 to v4.4
 2022-02-08 14:53:07 +08:00
zhanghongtong cc56ad272f fix(helm): remove the default environment variables from the template 2022-02-08 14:06:39 +08:00
zhanghongtong 352635f227 fix(helm): fix deploy error 2022-02-08 10:40:16 +08:00
zhongwencool 617402ed09 Merge branch 'main-v4.4' into sync-v4.3-to-v4.4 2022-02-08 09:59:21 +08:00
Ilya Averyanov 1480efde19 chore(ci): use make apps/emqx_auth_ldap-ct instead of rebar command 2022-02-07 21:55:30 +03:00
Zaiming (Stone) Shi a18f3bc971
Merge pull request #6860 from fernando-almeida/main-v4.3 
Updated Helm chart to support new features and updated README
 2022-02-07 17:30:36 +01:00
Zaiming (Stone) Shi e613843ce8
Merge pull request #6930 from zhongwencool/ci-pin-pytest 
ci(pytest): pin pytest version at 6.2.5.
 2022-02-07 17:14:51 +01:00
zhongwencool 51ed6abcd6 ci(pytest): pin pytest version at 6.2.5. 2022-02-07 17:23:13 +08:00
k32 8ed0daf5be
Merge pull request #6911 from k32/rpc-client-driver 
fix(emqx_schema): Allow to set gen_rpc.default_client_driver
 2022-02-02 13:19:44 +01:00
k32 ed98773ca7 fix(emqx_schema): Allow to set gen_rpc.default_client_driver 2022-02-02 12:42:26 +01:00
zhongwencool 3036f02963
Merge pull request #6893 from zhongwencool/watemark-limit-check 
fix(watermark): hight watermark should greater than low watermark.
 2022-01-28 19:06:44 +08:00
Shawn b5aeba86cd
Merge pull request #6894 from terry-xiaoyu/relup_test_failed 
fix(CI): build packages failed on release upgrade testing - again
 2022-01-28 18:00:00 +08:00
Shawn 633c5c16de fix(CI): build packages failed on release upgrade testing - again 2022-01-28 17:59:13 +08:00
zhongwencool 579905b92a fix(watermark): hight watermark should greater than low watermark. 2022-01-28 17:58:11 +08:00
Shawn 3fd978522d
Merge pull request #6891 from terry-xiaoyu/relup_test_failed 
fix(CI): build packages failed on release upgrade testing
 2022-01-28 17:14:09 +08:00
Shawn a4f873f7cd fix(CI): build packages failed on release upgrade testing 2022-01-28 17:07:16 +08:00
Shawn 7e26ae4f92
Merge pull request #6889 from HJianBo/fix-modules-appup 
fix(modules): update the appup.src
 2022-01-28 16:02:03 +08:00
JianBo He 1d7a1fde8a fix(modules): update the appup.src 2022-01-28 15:43:32 +08:00
Shawn 31a68f4627 fix(appup): No such module: emqx_mod_sup 2022-01-28 14:33:18 +08:00
Shawn 0500c475cf fix(appup): Multiply defined module: emqx_slow_subs 2022-01-28 12:22:29 +08:00
Shawn d15fd95ad4 fix(appup): Multiply defined module: emqx_session 2022-01-28 11:54:10 +08:00
Shawn 11a9f6232c
Merge pull request #6884 from emqx/copy_of_main-v4.3 
Sync code from main-v4.3 to main-v4.4
 2022-01-27 19:39:59 +08:00
Shawn 791b22f151
Merge branch 'main-v4.4' into copy_of_main-v4.3 2022-01-27 18:46:49 +08:00
Shawn 6319c3402f fix(appup): Multiply defined module: emqx_metrics 
make emqx-zip failed:

```
===> Error generating relup:
          Multiply defined module: emqx_metrics
```
 2022-01-27 18:01:17 +08:00
Zaiming (Stone) Shi 570bc5023b
Merge pull request #6879 from zmstone/fix-stop-command-defunct-detection 
fix: stop command should detect defunct pid
 2022-01-27 08:25:06 +01:00
zhongwencool ef82287634
Merge pull request #6883 from zhongwencool/fix-watermark-4.3 
fix(alarm): watermark replace >= =< with > <
 2022-01-27 14:32:16 +08:00
zhongwencool e2dec09b0d fix(alarm): watermark replace >= =< with > < 2022-01-27 11:59:48 +08:00
JianBo He 4cdd529b5a
Merge pull request #6866 from HJianBo/remove_connected_at_feild 
fix(webhook): remove the connected_at field for client.connect
 2022-01-27 10:41:53 +08:00
JianBo He 34c489da40
Merge pull request #6868 from HJianBo/fix-stomp-frame-parser 
Fix the sticky tcp stream parsing
 2022-01-27 10:40:37 +08:00
Shawn a66bfeaa25
Merge pull request #6871 from terry-xiaoyu/rebar3_download 
fix(ci): add some debug print for downloading rebar3
 2022-01-27 09:57:48 +08:00
Zaiming (Stone) Shi 72c909051b fix: stop command should detect defunct pid 2022-01-26 23:48:31 +01:00
Zaiming (Stone) Shi 61e9fd5f04
Merge pull request #6875 from zmstone/ci-find-upgrade-base-with-script 
ci: find relup base version using script scripts/relup-base-vsns.sh
 2022-01-26 20:52:09 +01:00
Zaiming (Stone) Shi e5d196569c ci: find relup base version using script scripts/relup-base-vsns.sh 2022-01-26 18:26:43 +01:00
Zaiming (Stone) Shi f65cd003c0
Merge pull request #6872 from zmstone/update-windows-build-instructions 
Update windows build instructions
 2022-01-26 13:33:32 +01:00
Zaiming (Stone) Shi 99712d3521 ci: debug windows build 2022-01-26 12:08:32 +01:00
Shawn 301d6bf794 fix(ci): add some debug print for downloading rebar3 2022-01-26 18:55:17 +08:00
Fernando Almeida b91dc1c13d fix(helm-chart): revised software name to match conventioned name 
fix(helm-chart): added missing new-line from resource templates
 2022-01-26 09:01:25 +00:00
zhongwencool d9e7868d64
Merge pull request #6865 from zhongwencool/sys-mem-alarm 
fix(appup): add emqx.erl to appup.src
 2022-01-26 16:40:22 +08:00
JianBo He 18ed00e57e test(stomp): add testcase for sticky tcp strem 2022-01-26 15:49:51 +08:00
JianBo He fd88f484d2 fix(stomp): fix the sticky tcp stream parsing 2022-01-26 15:41:14 +08:00
JianBo He 85652aa373 fix(webhook): remove the connected_at field for client.connect 2022-01-26 15:01:36 +08:00
zhongwencool 9d633507f5 fix(appup): add emqx.erl to appup.src 2022-01-26 14:32:00 +08:00