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

7823 Commits

Author SHA1 Message Date
zhongwencool 7fc3f25da1
Merge pull request #8754 from zhongwencool/bump-v4.4.8-beta.1 
chore: bump to v4.4.8-beta.1
 2022-08-17 23:53:01 +08:00
zhongwencool 32a0aebf77 chore: bump to v4.4.8-beta.1 2022-08-17 23:52:19 +08:00
Thales Macedo Garitezi a09575a5e6
Merge pull request #8696 from thalesmg/relup-upgrade-44-to-45 
feat: enable upgrading release from 4.4.X to 4.5.Y
 2022-08-15 10:57:07 -03:00
Thales Macedo Garitezi fc9e802b26 chore: bump release version, app vsns, appups 2022-08-12 13:41:52 -03:00
Thales Macedo Garitezi 98da31e8b2 feat: enable importing backup json for 4.5 2022-08-12 11:15:58 -03:00
Thales Macedo Garitezi efef052ec7 feat: enable upgrading release from 4.4.X to 4.5.Y 
When upgrading from 4.4.X, the `install_upgrade` script from 4.4.X
is used, which forbids such transition.
 2022-08-12 11:15:58 -03:00
Thales Macedo Garitezi 7b887078c7
Merge pull request #8713 from emqx/dev/v4.4.7 
merge `v4.4.7` tag back into `main-v4.4`
 2022-08-12 11:14:55 -03:00
zhouzb 2af895e579
Merge pull request #8703 from tigercl/chore/bump-vsn-4.4 
chore: bump vsn to 4.4.7
 2022-08-12 10:53:19 +08:00
zhouzb a6ff730aa8 chore: bump vsn to 4.4.7 2022-08-12 10:43:06 +08:00
zhongwencool 9a1beb1148
Merge pull request #8668 from zhongwencool/add-trace-detail-api 
feat: add GET /trace/:name/detail HTTP API
 2022-08-10 23:16:33 +08:00
Zaiming (Stone) Shi 418db4a9d6
Merge pull request #8680 from emqx/dev/v4.4.7 
sync dev/v4.4.7 to  main-v4.4
 2022-08-10 13:29:01 +01:00
Zaiming (Stone) Shi afed5546ea
Merge pull request #8669 from zmstone/0809-revert-app-desc 
chore: revert EMQX to EMQ X in emqx app desc
 2022-08-10 09:20:58 +01:00
zhongwencool 0951e1b409 Merge branch 'add-trace-detail-api' of https://github.com/zhongwencool/emqx into add-trace-detail-api 2022-08-10 15:29:31 +08:00
zhongwencool 0a98071068 Merge branch 'add-trace-detail-api' of https://github.com/zhongwencool/emqx into add-trace-detail-api 2022-08-10 15:29:08 +08:00
Zaiming (Stone) Shi e7f8e00aa4 ci: remove -S option for env 2022-08-10 09:01:39 +02:00
zhouzb ce0ad7bbbe
Merge pull request #8678 from tigercl/chore/bump-vsn 
chore: change vsn to 4.4.7-beta.1
 2022-08-10 14:56:57 +08:00
zhouzb 8c08a37458 chore: change vsn to 4.4.7-beta.1 2022-08-10 14:50:14 +08:00
zhongwencool cde2812005 Merge branch 'add-trace-detail-api' of https://github.com/zhongwencool/emqx into add-trace-detail-api 2022-08-10 11:45:22 +08:00
zhongwencool e59f542afd test: add more debug info for t_trace_file_detail ct 2022-08-10 11:45:02 +08:00
zhongwencool e239d1a303
Merge branch 'main-v4.4' into add-trace-detail-api 2022-08-09 17:08:25 +08:00
zhongwencool 6b8d5e10de chore: update emqx_modules version 2022-08-09 17:02:57 +08:00
Zaiming (Stone) Shi 15b97ec78e chore: revert EMQX to EMQ X in emqx app desc 2022-08-09 10:28:55 +02:00
zhongwencool 4e362d2d0a feat: add GET /trace/:name/detail HTTP API 2022-08-09 16:09:58 +08:00
zhongwencool 2443c06810
Merge pull request #8659 from zhongwencool/fix-trace-disable-return-enoent 
fix: check if trace is enabled when the file is not found
 2022-08-09 09:13:31 +08:00
Zaiming (Stone) Shi 16edf61b50
Merge pull request #8665 from zmstone/chore-sync-dev/v4.3.18-todev/v4.4.7 
Chore sync dev/v4.3.18 to dev/v4.4.7
 2022-08-08 17:35:18 +01:00
Zaiming (Stone) Shi eca211373f Merge remote-tracking branch 'origin/dev/v4.3.18' into dev/v4.4.7 2022-08-08 16:39:09 +02:00
zhongwencool 9b10aefd80 chore: update changelog and appup.src 2022-08-08 14:24:04 +08:00
zhongwencool 2740c80b20 fix: check if trace is enabled when the file is not found 2022-08-08 11:59:26 +08:00
Zaiming (Stone) Shi ccb51265b8 chore: prepare for 4.3.18-beta.1 release 2022-08-05 11:41:21 +02:00
Zaiming (Stone) Shi f943892fa8 docs: update changelog for SSL gc 2022-08-05 11:41:00 +02:00
Zaiming (Stone) Shi 6a1a784ee1
Merge pull request #8641 from Rory-Z/chore/fix-helm-error 
ci: fix helm version error
 2022-08-04 22:01:11 +01:00
Zaiming (Stone) Shi 683bec16a3
Merge pull request #8436 from zmstone/0706-ci-use-new-lux-image 
0706 ci use new lux image
 2022-08-04 22:00:34 +01:00
Thales Macedo Garitezi 0155b4209e
Merge pull request #8649 from thalesmg/esockd-tls-gc-43 
feat: add option to gc after TLS/SSL handshake (4.3)
 2022-08-04 13:45:59 -03:00
William Yang f2a9f1b81e
Merge pull request #8653 from qzhuyan/fix/william/use-otp-matching-boot-file 
fix(upgrade): ensure use correct no_dot_erlang.boot
 2022-08-04 17:09:01 +02:00
William Yang a88c42cf82 fix(upgrade): ensure use correct no_dot_erlang.boot 2022-08-04 15:42:19 +02:00
Thales Macedo Garitezi 5e9462afc8 feat: add option to gc after TLS/SSL handshake (4.3) 
Port of https://github.com/emqx/emqx/pull/8637
 2022-08-04 08:51:50 -03:00
Zaiming (Stone) Shi 5a9e8a23b3
Merge pull request #8652 from thalesmg/fix-env-flag 
fix: rm non-portable `env` option
 2022-08-04 06:35:57 +01:00
Thales Macedo Garitezi c533f58ee5 fix: rm non-portable `env` option 
On some systems, like `centos7`, `env` does not have a `-S` option.
 2022-08-03 17:47:11 -03:00
Zaiming (Stone) Shi 6d1bb20eca ci: update rux match pattern for emqtt_bench outputs 2022-08-03 16:46:10 +02:00
Zaiming (Stone) Shi ef1b7e97bf ci: use lux from emqx-builder/4.4-19:24.1.5-3-ubuntu20.04 2022-08-03 15:33:16 +02:00
Zaiming (Stone) Shi 1c56b70d05
Merge pull request #8648 from zmstone/0803-sync-v4.3-to-v4.4 
sync v4.3 to v4.4
 2022-08-03 14:32:24 +01:00
Zaiming (Stone) Shi b19298b2d9 chore: update chart version 2022-08-03 15:23:10 +02:00
Zaiming (Stone) Shi 07afc26927 ci: remove macOS 10 2022-08-03 14:35:41 +02:00
Zaiming (Stone) Shi db979f7b48 chore: update release version and appups prepare for new version 4.4.7 2022-08-03 13:41:11 +02:00
Zaiming (Stone) Shi f47d952d82 Merge main-4.3 to 0803-sync-v4.3-to-v4.4 2022-08-03 13:41:11 +02:00
Zaiming (Stone) Shi df6303d793
Merge pull request #8646 from zmstone/0803-build-fix-relup-overwrite-escript 
build: fix relup app overwrite escript
 2022-08-03 10:34:20 +01:00
Zaiming (Stone) Shi ddd6f066e4 chore: run escript in compile mode 2022-08-03 10:41:45 +02:00
Zaiming (Stone) Shi e74a97013e build: fix relup app overwrite escript 
the rel file name is always emqx.rel, has nothing to do with profile
 2022-08-03 10:01:20 +02:00
Rory Z 9d71aff5d3 ci: fix helm version error 2022-08-03 10:16:16 +08:00
zhouzb 763f0a852d
Merge pull request #8639 from tigercl/chore/vsn 
chore: update vsn for helm chart
 2022-08-03 10:04:10 +08:00