Commit Graph

6987 Commits

Author SHA1 Message Date
Xinyu Liu 9a6ca6adf5
Merge pull request #7481 from HJianBo/merge-main-v4.3-into-v4.4
Pre-release v4.4.2-rc.2: Merge v4.3.13-rc.3 into main-v4.4
2022-03-31 22:18:28 +08:00
JianBo He 5fa30b2d51 chore: bump vsn to 4.4.2-rc.2 2022-03-31 21:55:57 +08:00
JianBo He 610bfb7613 Merge tag 'v4.3.13-rc.3' into merge-main-v4.3-into-v4.4
Version v4.3.13-rc.3
2022-03-31 21:55:43 +08:00
Xinyu Liu 494eb3413c
Merge pull request #7475 from zmstone/main-v4.4
[4.4] update to builder images to 4.4-8
2022-03-31 18:49:25 +08:00
Xinyu Liu 34f1f697ff
Merge pull request #7476 from terry-xiaoyu/release_4.3.13-rc.3
chore: release 4.3.13-rc.3
2022-03-31 17:57:59 +08:00
Shawn c037c2cf6c chore: release 4.3.13-rc.3 2022-03-31 17:54:20 +08:00
Xinyu Liu e1dfa3eed2
Merge pull request #7471 from zmstone/fix-script-reset-before-clean
chore(appup): fix update-appup.sh
2022-03-31 17:51:23 +08:00
Zaiming (Stone) Shi 815c96e37b
Merge pull request #7468 from zmstone/merge-v43-to-v44
Merge v43 to v44
2022-03-31 11:48:17 +02:00
Zaiming (Stone) Shi 4438b9e59d docs: update 4.4 change log to cover changes made for centos 7 2022-03-31 11:26:33 +02:00
Zaiming (Stone) Shi bbe6209539
Merge pull request #7472 from zmstone/docs-update-4.3-changelog
docs: Update CHANGES-4.3.md to cover changes made in build env
2022-03-31 10:43:39 +02:00
Zaiming (Stone) Shi b9c02bff1e ci: delete yum install openssl11 in test 2022-03-31 10:39:30 +02:00
Zaiming (Stone) Shi 9cd63c87fc docs: Update CHANGES-4.3.md to cover changes made in build env 2022-03-31 10:25:57 +02:00
Zaiming (Stone) Shi 88c30e3a4f ci: bump to latest emqx-builder image 4.4-8 2022-03-31 10:14:01 +02:00
Zaiming (Stone) Shi 38447ff187 chore(appup): fix update-appup.sh
git reset before clean
2022-03-31 10:10:12 +02:00
Zaiming (Stone) Shi 0ac979361e fix(appup): re-generate emqx.appup.src 2022-03-31 10:06:32 +02:00
Zaiming (Stone) Shi 48a65981af Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-31 09:28:58 +02:00
zhongwencool 3303b987a1
Merge pull request #7447 from zhongwencool/export-test-function
test: Export test function
2022-03-29 22:56:41 +08:00
zhongwencool 16b8fc6edc fix: emqx.appup.src 2022-03-29 21:39:44 +08:00
Xinyu Liu c3d3a5a464
Merge pull request #7450 from emqx/revert-7392-re_source_test
fix(revert): connection test when creating a resource
2022-03-29 19:17:55 +08:00
DDDHuang 47e807b2ac
Revert "fix(rule): connection test when creating a resource" 2022-03-29 19:16:06 +08:00
DDDHuang 0684b4f716
Merge pull request #7392 from DDDHuang/re_source_test
fix(rule): connection test when creating a resource
2022-03-29 19:09:10 +08:00
DDDHuang d297e883c2 fix: appup 2022-03-29 17:37:00 +08:00
zhongwencool 517f8a7c9b chore: add validator schema function 2022-03-29 14:53:03 +08:00
zhongwencool f9a85614d4 chore: export test function for ee's hot-conf 2022-03-29 14:52:35 +08:00
DDDHuang 46cfcf662e fix(rule): safe apply & test resource in cluster 2022-03-29 13:37:32 +08:00
DDDHuang 63616c5e93 Merge branch 'main-v4.3' of https://github.com/emqx/emqx into re_source_test 2022-03-29 09:07:58 +08:00
Zaiming (Stone) Shi 4991dcbe3b
Merge pull request #7426 from zmstone/chore-fix-appup-update-script
chore: fix appup update script
2022-03-28 17:39:55 +02:00
Zaiming (Stone) Shi 59fae1714b chore: use shorter path 2022-03-28 14:10:33 +02:00
Zaiming (Stone) Shi 6ca0e63599 chore: fix appup update script
so it can handle switch between tags
2022-03-28 09:58:03 +02:00
Yang Miao c0da7bcee0
Merge pull request #7407 from EMQ-YangM/add_client_check_acl_complete
feat: add rule events: 'client.connack', 'client.check_acl_complete'
2022-03-28 10:31:27 +08:00
EMQ-YangM 059fc6e3c7 feat(emqx_rule_events): add field 'is_cache' 2022-03-25 18:05:25 +08:00
EMQ-YangM 44f4dfa498 fix(CHANGES): update CHANGES-4.4.md 2022-03-25 13:40:29 +08:00
EMQ-YangM 3eab6b436b fix(appup): load_module emqx_access_control 2022-03-25 11:27:28 +08:00
EMQ-YangM 0ffb66ee7f fix(CHANGES): update CHANGES-4.4.md 2022-03-25 11:12:55 +08:00
EMQ-YangM e0d142c625 feat: add client.check_acl_complete event 2022-03-25 11:08:30 +08:00
zhouzb 1d6b7bbeae
Merge pull request #7404 from zmstone/ci-4.4-exclude-base-vsn-before-4.4.2-for-debian11 2022-03-25 08:29:54 +08:00
Zaiming (Stone) Shi 489dbec76b ci: exclude 4.4.0 and 4.4.1 for debian11 2022-03-24 20:42:51 +01:00
Zaiming (Stone) Shi 7e2be899fb
Merge pull request #7403 from zmstone/merge-v43-to-v44
Merge v43 to v44
2022-03-24 19:57:13 +01:00
Zaiming (Stone) Shi df8a018fc3
Merge pull request #7402 from zmstone/chore-delete-warning-message
chore: delete warning message for session upgrade/downgrade
2022-03-24 16:23:03 +01:00
Zaiming (Stone) Shi 4cf3cf7134 Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4 2022-03-24 16:05:28 +01:00
Zaiming (Stone) Shi d3bcc201d6
Merge pull request #7401 from zmstone/ci-add-build-base-option-to-appup-update-script
chore: update-appup.sh always rebuild baseline
2022-03-24 15:58:25 +01:00
Zaiming (Stone) Shi b8afa16b53 chore: fix shellcheck 2022-03-24 12:28:34 +01:00
Zaiming (Stone) Shi 2d97b1bb89 chore: delete warning message for session upgrade/downgrade 2022-03-24 12:26:09 +01:00
Zaiming (Stone) Shi 59b8fd6ff8
Merge pull request #7383 from zmstone/minor-fixes
Minor fixes 4.4
2022-03-24 11:26:05 +01:00
Zaiming (Stone) Shi 3944888a19 chore: update-appup.sh always rebuild baseline
Reasons
* OTP version might be different in developer's env and build env
* For some tags, we do not build release. e.g. rel-v4.4.X
2022-03-24 11:23:47 +01:00
JianBo He d1503731a1
Merge pull request #7395 from HJianBo/bump-vsn-for-4.4
Pre-release v4.4.2: Bump vsn and update dashboard vsn
2022-03-24 17:11:52 +08:00
JianBo He 242035139e
Merge pull request #7394 from HJianBo/update-dashboard-vsn
Pre-release v4.3.13: Update dashboard vsn
2022-03-24 17:11:33 +08:00
EMQ-YangM 326b01968b fix(appup): load_module emqx_rule_events 2022-03-24 16:52:01 +08:00
Zaiming (Stone) Shi a39cc47a45
Merge pull request #7380 from zmstone/test-fix-data-import-case-failure
test: fix data import test failure
2022-03-24 08:26:33 +01:00
EMQ-YangM 3410e20fbe feat(emqx_rule_engine_events): add client_connack event 2022-03-24 14:58:41 +08:00