Commit Graph

7202 Commits

Author SHA1 Message Date
JianBo He bd640a1748 Merge tag 'v4.3.14' into fix/v4.4.3 2022-04-21 17:27:42 +08:00
Zaiming (Stone) Shi ec80a05a50
Merge pull request #7702 from savonarola/fix-install_upgrade
fix(install_upgrade): fix unpack_zipballs return value
2022-04-21 10:05:14 +01:00
Ilya Averyanov d60252d678 fix(install_upgrade): fix unpack_zipballs return value 2022-04-21 11:56:51 +03:00
Xinyu Liu 645b79c793
Merge pull request #7646 from emqx/copy-of_main-v4.3
Merge main-v4.3 -> main-v4.4
2022-04-18 12:02:40 +08:00
Xinyu Liu ca43fb73c5
Merge branch 'main-v4.4' into copy-of_main-v4.3 2022-04-18 12:02:11 +08:00
Xinyu Liu 93411ecd4b
Merge pull request #7645 from HJianBo/bump-vsn-for-v4.3
chore: tag 4.3.14
2022-04-18 11:59:07 +08:00
JianBo He c0f6c08836 chore: tag 4.3.14 2022-04-18 11:55:46 +08:00
Xinyu Liu cbf5ad849f
Merge pull request #7637 from HJianBo/merge-main-v4.3-into-v4.4
Merge main v4.3 into v4.4
2022-04-16 12:41:53 +08:00
JimMoen 09a100fc2d chore: apps version check ignore comments in erl/hrl file 2022-04-16 12:10:52 +08:00
JianBo He 89c65b6535 Merge tag 'v4.3.14-rc.4' into merge-main-v4.3-into-v4.4 2022-04-16 11:28:07 +08:00
Xinyu Liu 79b43e2ae0
Merge pull request #7636 from HJianBo/bump-vsn-for-v4.3
Pre-release v4.3.14-rc.4: Bump vsn
2022-04-16 10:51:28 +08:00
JianBo He e986a2cf35 chore: bump vsn 2022-04-16 10:49:32 +08:00
JianBo He ffdf7fb7b6
Merge pull request #7629 from DDDHuang/backup_file_43
fix: backup data filename, uri decode
2022-04-16 10:36:43 +08:00
Xinyu Liu ade2716616
Merge pull request #7635 from terry-xiaoyu/test_resource_failed
fix(rule): test resource failed from all nodes
2022-04-16 02:18:44 +08:00
Shawn 898dc00f58 fix(rule): test resource failed from all nodes 2022-04-16 01:49:01 +08:00
DDDHuang 9cf6b47e95
Merge pull request #7630 from DDDHuang/backup_file_44
fix: backup data filename, uri decode
2022-04-15 17:50:24 +08:00
DDDHuang b28c751856 fix: backup data filename, uri decode 2022-04-15 17:12:04 +08:00
DDDHuang 12874aa688 fix: backup data filename, uri decode 2022-04-15 16:12:40 +08:00
JianBo He 5907424a83
Merge pull request #7470 from JimMoen/update-copyright-year
Update copyright years
2022-04-15 14:40:43 +08:00
Xinyu Liu 9b18bcd3c2
Merge pull request #7619 from HJianBo/merge-main-v4.3-into-v4.4
Pre-release v4.4.3-rc.3: Merge main v4.3 into v4.4
2022-04-14 11:58:30 +08:00
JianBo He c8c52dfc39 Merge remote-tracking branch 'ce/main-v4.3' into merge-main-v4.3-into-v4.4 2022-04-14 11:56:35 +08:00
Xinyu Liu 3519dd167a
Merge pull request #7618 from HJianBo/relv4314
Pre-release v4.3.14-rc.3: Bump vsn
2022-04-14 11:55:49 +08:00
JianBo He d40a146139 chore: bump vsn 2022-04-14 11:54:05 +08:00
JimMoen 8f13a96788 chore: ignore comments and blank lines when app version checking 2022-04-14 11:23:25 +08:00
JimMoen 6168745f90 chore: update copyright 2022-04-14 11:23:25 +08:00
Xinyu Liu 97dd625c38
Merge pull request #7616 from emqx/revert-7596-jwt-acl-nocache
Revert "Add support for JWT authorization"
2022-04-14 11:14:40 +08:00
Xinyu Liu cb1b318312
Merge pull request #7617 from HJianBo/fix-shared-subs
fix(shared-sub): convert group name to binary
2022-04-14 11:08:27 +08:00
JianBo He 7b14e822a6 fix(shared-sub): convert group name to binary 2022-04-14 10:59:29 +08:00
Xinyu Liu a89f6f4b95
Merge pull request #7612 from terry-xiaoyu/post_existing_rules
fix(rules): deny POST /rules with an existing Id
2022-04-14 10:48:22 +08:00
JianBo He 47a5bc3f09
Revert "Add support for JWT authorization" 2022-04-14 10:44:06 +08:00
Shawn ae8f03a188 fix(rules): deny POST /rules with an existing Id 2022-04-13 23:16:29 +08:00
Ilya Averyanov 3544537906
Merge pull request #7596 from savonarola/jwt-acl-nocache
Add support for JWT authorization
2022-04-13 17:21:45 +03:00
Ilya Averyanov d8db671abb feat(emqx_auth_jwt): use JWT for ACL checks 2022-04-13 13:17:27 +03:00
Ilya Averyanov f763775588 chore(emqx_auth_jwt): do not use gen_server call for jwt verification 2022-04-13 13:16:53 +03:00
Xinyu Liu 4e515a3f83
Merge pull request #7603 from EMQ-YangM/fix_zip_compress
fix: add zip_compress functions
2022-04-13 15:37:02 +08:00
EMQ-YangM 4893cc2c6c fix: update CHANGES-4.3.md 2022-04-13 15:33:35 +08:00
EMQ-YangM 1886893fa1 fix: add zip_compress functions 2022-04-13 14:19:32 +08:00
Xinyu Liu a42de63791
Merge pull request #7599 from HJianBo/merge-main-v4.3-into-v4.4
Merge main v4.3 into v4.4
2022-04-13 09:17:32 +08:00
JianBo He fab71ddcfe Merge tag 'v4.3.14-rc.2' into merge-main-v4.3-into-v4.4 2022-04-13 09:13:52 +08:00
Xinyu Liu c4b01fc2ce
Merge pull request #7595 from emqx/per_group_sub_fix
Per group sub fix
2022-04-13 09:12:12 +08:00
Georgy Sychev 8c553da72b fix(shared): group strategies are binaries now 2022-04-13 09:09:54 +08:00
JianBo He 019076e873
Merge pull request #7594 from lafirest/test/empty_topic_name_case
test(frame): fix empty topic name case not running
2022-04-12 22:30:24 +08:00
JianBo He 9ab533b206
Merge pull request #7592 from DDDHuang/bridge_mqtt_subqos
fix: bridge mqtt config schema, subscriptions with default QoS 0
2022-04-12 18:43:42 +08:00
firest 2c47869426 test(frame): fix empty topic name case not running 2022-04-12 18:40:37 +08:00
JianBo He c28e50b6a7
Merge pull request #7587 from HJianBo/merge-main-v4.3-into-v4.4
Pre-release v4.4.3-rc2: Merge main-v4.3 into main-v4.4
2022-04-12 17:15:32 +08:00
DDDHuang 5b9452979d fix: bridge mqtt config schema, subscriptions with default QoS 0 2022-04-12 16:47:39 +08:00
JianBo He 3f9f53a1e0 chore: bump vsn 2022-04-12 13:48:43 +08:00
JianBo He f8080ed71b Merge tag 'v4.3.14-rc.2' into merge-main-v4.3-into-v4.4 2022-04-12 13:47:11 +08:00
JianBo He 6c12b5f242
Merge pull request #7585 from HJianBo/rel-v4314-rc2
chore: bump vsn to 4.3.14-rc.2
2022-04-12 13:40:02 +08:00
JianBo He b9fed0d8fb
Merge pull request #7575 from HJianBo/upgrade-ehttpc
Upgrade ehttpc to 0.2.0
2022-04-12 13:37:39 +08:00