Commit Graph

9121 Commits

Author SHA1 Message Date
Xinyu Liu 3cc0bb8284
Merge branch 'dev/v4.3.14' into fix_patter_match_v4.3 2022-04-01 09:14:34 +08:00
Xinyu Liu 3bf9089533
Merge pull request #7487 from zmstone/0331-4.4.2-no-upgrade-base-for-debian11
build: no upgrade base for debian11 at version 4.4.2
2022-04-01 08:48:35 +08:00
Xinyu Liu 5290e93ef1
Merge pull request #7488 from emqx/4.3-update-erlang-for-windows
ci: upgrade erlang for windows
2022-04-01 08:48:21 +08:00
Xinyu Liu 79b6b881ec
Merge pull request #7482 from zmstone/4.3-upgrader-node-hidden-connect
fix(relup): upgrader node hidden connect target node
2022-04-01 08:45:06 +08:00
Zaiming (Stone) Shi 5467262b0f Merge remote-tracking branch 'origin/main-v4.3' into dev/v4.3.14 2022-04-01 00:37:59 +02:00
Zaiming (Stone) Shi 8785f87473 ci: upgrade erlang for windows 2022-03-31 23:29:53 +02:00
Zaiming (Stone) Shi 363242fd61 build: no upgrade base for debian11 at version 4.4.2 2022-03-31 22:39:56 +02:00
Zaiming (Stone) Shi cd06edf8c8 fix(relup): upgrader node hidden connect target node 2022-03-31 18:30:20 +02:00
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
zhongwencool 6e544606ef
Merge pull request #7469 from zhongwencool/remove-st-from-catch
chore: remove useless stacktrace from catch.
2022-03-31 22:16:00 +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
EMQ-YangM ea17dd776c fix: update CHANGES-4.3.md 2022-03-31 18:21:40 +08:00
EMQ-YangM 326634c287 feat: impl api PUT /rules/{id}/reset_metrics 2022-03-31 18:00:57 +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
zhongwencool fe6af95f88 chore: remove useless stacktrace from catch. 2022-03-31 16:01:20 +08: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
EMQ-YangM 510e4d31e4 fix: load_module emqx_rule_events 2022-03-31 13:48:12 +08:00
JianBo He 1a302b1914
Merge pull request #7460 from lafirest/fix/empty_topic_4.3.14
fix(frame): forbidden empty topic in strict mode
2022-03-31 11:48:56 +08:00
firest ea8ddcef60 fix: fix spell error in CHANGES-4.3.md 2022-03-31 10:34:06 +08:00
DDDHuang e801f5b3a2
Merge pull request #7453 from DDDHuang/re_source_test_4314
fix(rule): connection test when creating a resource
2022-03-30 15:21:48 +08:00
firest 22beba8ebd chore: update changes-4.3.md 2022-03-30 11:12:33 +08:00
firest bf68735664 fix(frame): forbidden empty topic in strict mode 2022-03-30 10:42:56 +08:00
EMQ-YangM cead8c9056 fix: use masp:get/3 to avoid crash after match failure 2022-03-30 09:44:06 +08:00
DDDHuang 6ab0934674 fix(rule): connection test when creating a resource 2022-03-30 09:23:51 +08: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
zhongwencool 8c6cd2e92f
Merge pull request #7443 from zhongwencool/export-test-case-v4.3.14
Export test function for CT v4.3.14
2022-03-29 18:02:30 +08:00
DDDHuang d297e883c2 fix: appup 2022-03-29 17:37:00 +08:00
zhongwencool 4ee586a738 fix: appup.src 2022-03-29 17:12:35 +08:00
zhongwencool 06adcb9126 Merge branch 'dev/v4.3.14' into export-test-case-v4.3.14 2022-03-29 15:55:24 +08:00
zhongwencool b47aef63a1 fix: emqx.appup.src 2022-03-29 15:16:57 +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