Commit Graph

7202 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi 84651d5b07 chore: no error when delete rebar.lock using make clean-all command 2022-04-04 09:52:41 +02:00
Zaiming (Stone) Shi d49c8b61e6
Merge pull request #7425 from emqx/dev/v4.3.14
dev/v4.3.14 -> main-v4.3
2022-04-03 18:06:14 +02:00
Zaiming (Stone) Shi 2e7a741022 chore: bump dashboard app version 2022-04-03 08:43:34 +02:00
Xinyu Liu 7b4d3ecb3a
Merge pull request #7504 from EMQ-YangM/update_mongodb_driver
fix: update mongodb driver to fix potential process leak
2022-04-03 11:59:09 +08:00
Zaiming (Stone) Shi 67ce53b5fc fix(appup): re-generated emqx_rule_engine.appup.src 2022-04-02 23:25:36 +02:00
Zaiming (Stone) Shi a54813dd69 fix(appup): re-generate appup from 4.3.13 2022-04-02 23:00:41 +02:00
Zaiming (Stone) Shi 19bf4c3b17 Merge remote-tracking branch 'origin/main-v4.3' into dev/v4.3.14 2022-04-02 22:34:37 +02:00
Yang Miao 851bfcfd76
Merge pull request #7503 from EMQ-YangM/dev/v4.3.14
feat: enhanced rule engine error handling when json parsing error
2022-04-02 17:18:00 +08:00
EMQ-YangM 9d25c58bb1 fix: move mongodb-erlang to top level rebar.config 2022-04-02 16:54:48 +08:00
EMQ-YangM 299c369d80 feat: enhanced rule engine error handling when json parsing error 2022-04-02 16:24:07 +08:00
Xinyu Liu d676f8488e
Merge pull request #7502 from emqx/copy-of-main-v4.3
Merge main-v4.3 to main-v4.4
2022-04-02 11:56:44 +08:00
Xinyu Liu 6d9816142f
Merge branch 'main-v4.4' into copy-of-main-v4.3 2022-04-02 11:55:49 +08:00
Shawn 4a57c10f61 chore: release 4.3.13 2022-04-02 11:41:00 +08:00
zhouzb 3b886035cc
Merge pull request #7501 from tigercl/chore/release-vsn
chore: bump release vsn
2022-04-02 10:31:52 +08:00
zhouzb 3610f931cf chore: bump release vsn 2022-04-02 10:29:32 +08:00
EMQ-YangM c84a4b2b6b fix: update mongodb driver to fix potential process leak 2022-04-02 10:27:44 +08:00
zhouzb 383d2966ef
Merge pull request #7500 from Rory-Z/main-v4.3
ci: push docker image when tag event
2022-04-02 10:26:39 +08:00
zhanghongtong e183ae2499 ci: push docker image when tag event 2022-04-02 10:13:37 +08:00
Zaiming (Stone) Shi 25dc4ab14f docs: fix typos in CLI doc, add-froard not add-forwards 2022-04-01 18:28:25 +02:00
Shawn 3bbc7bf31f chore: release 4.4.2 2022-04-01 18:05:39 +08:00
Shawn 1d2aa1c8c1 chore: release 4.3.13 2022-04-01 17:55:43 +08:00
zhongwencool 5454f0ce04
Merge pull request #7493 from zhongwencool/pin-ehttpc-0.1.15
fix: force delete ehttpc pool.
2022-04-01 17:48:06 +08:00
zhongwencool fa8a222b38 fix: force delete ehttpc pool. 2022-04-01 17:41:12 +08:00
Yang Miao 5d3caf3b1f
Merge pull request #7474 from EMQ-YangM/dev/v4.3.14
feat: impl api PUT /rules/{id}/reset_metrics
2022-04-01 13:25:11 +08:00
Xinyu Liu 941b409bf9
Merge pull request #7490 from emqx/merge-main-v4.3-into-v4.4
Merge main v4.3 into v4.4
2022-04-01 10:45:26 +08:00
JianBo He 134d00e76b Merge tag 'v4.3.13-rc.4' into merge-main-v4.3-into-v4.4
Version v4.3.13-rc.4
2022-04-01 10:37:58 +08:00
Shawn ec0d43bcf7 chore: release 4.3.13-rc.4 2022-04-01 10:01:48 +08:00
Xinyu Liu 42c3639cbb
Merge pull request #7489 from HJianBo/merge-main-v4.3-into-v4.4
Pre-Release v4.4.2-rc.3: Merge main-v4.3 into v4.4
2022-04-01 09:57:59 +08:00
JianBo He 9c1848e440 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-04-01 09:36:38 +08:00
Xinyu Liu b84ef11935
Merge branch 'dev/v4.3.14' into dev/v4.3.14 2022-04-01 09:32:42 +08:00
Xinyu Liu 39a928f85e
Merge pull request #7459 from EMQ-YangM/fix_patter_match_v4.3
fix: use maps:get/3 to avoid crash after match failure
2022-04-01 09:15:59 +08:00
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