Commit Graph

607 Commits

Author SHA1 Message Date
Zaiming Shi
c422b200be
Merge pull request #4088 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-27
2021-01-27 22:02:52 +01:00
zhouzb
e6235d3bc9 fix(scheme): fix default scheme 2021-01-27 19:11:41 +01:00
zhouzb
92d307b1b3 fix(scheme): update test case 2021-01-27 19:11:41 +01:00
zhouzb
45aafc75dd fix(scheme): using uri_string:normalize/1 2021-01-27 19:11:41 +01:00
zhouzb
311df2f8a6 fix(scheme): fix scheme parsing 2021-01-27 19:11:41 +01:00
zhouzb
a631a2d64f fix(ssl): fix ssl option 2021-01-27 19:11:41 +01:00
wwhai
b5c435e211 fix(rule-engine): add format space 2021-01-27 19:01:11 +01:00
zhanghongtong
689b530b4f chore(auth-http): remove needless test case 2021-01-27 19:55:21 +08:00
JianBo He
b77ac247eb chore(auth-http): remove needless lines 2021-01-27 19:55:21 +08:00
zhanghongtong
eaa7394554 chore(ldap): delete uesless dir 2021-01-27 18:58:35 +08:00
JianBo He
02cb8d0211 chore(style): set warnings_as_errors compile option 2021-01-27 18:02:12 +08:00
wwhai
001a89a396
Merge pull request #4070 from wwhai/fix-update-problem
feat(rule-engine): change init resource to test resource
2021-01-27 17:09:37 +08:00
wwhai
e7153c4266 fix(rule-engine): add cluster init callback 2021-01-27 15:06:12 +08:00
JianBo He
7919f08e03
Merge pull request #4067 from HJianBo/fix/webhook_certs
fix(webhook): fix bad https confs
2021-01-27 10:44:28 +08:00
Zaiming Shi
fa7d96dd4a Merge remote-tracking branch 'origin/dev/v4.3.0' into dev/v5.0 2021-01-26 19:32:55 +01:00
Zaiming Shi
937390fe0f
Merge pull request #4072 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-25
2021-01-25 22:05:03 +01:00
Zaiming Shi
5477457c7e fix(emqx_recon): fix badarg for remote module load 2021-01-25 19:09:41 +01:00
wwhai
81da182e1b feat(rule-engine): change init resource to test resource 2021-01-25 19:44:32 +08:00
JianBo He
8d56371465
Merge branch 'dev/v4.3.0' into fix/webhook_certs 2021-01-25 19:22:14 +08:00
Zaiming Shi
6a6a94f99e
Merge pull request #4057 from zmstone/fix-emqx_vm-allocator-info-otp-23-compatibility
fix emqx_vm allocator info otp 23 compatibility
2021-01-25 11:36:47 +01:00
JianBo He
86942ffa14 fix(webhook): fix bad https confs 2021-01-25 18:20:12 +08:00
JianBo He
670c3894fb chore(redis): upgrade eredis_cluster to 0.6.4 2021-01-25 17:29:56 +08:00
zhouzb
b25dedccc9 refactor(inet parse): refactor inet parse 2021-01-25 15:59:23 +08:00
JianBo He
67e56658a7 fix(bridge-mqtt): fix bad time unit 2021-01-25 15:35:04 +08:00
JianBo He
3de8fea435 fix(bridge-mqtt): fix bad received metrics counting 2021-01-25 15:35:04 +08:00
wwhai
f3420e8810 fix(rule-engine): fix update resource maybe remove resource 2021-01-25 10:56:58 +08:00
JianBo He
3322bb60c3 fix(exproto): fix the bad return type for auth 2021-01-25 09:24:03 +08:00
Zaiming Shi
20c37609af
Merge pull request #4062 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-24
2021-01-24 22:29:09 +01:00
Zaiming Shi
8a05380388 refactor(emqx_coap): use url_string module to decode url encoded topic 2021-01-24 10:28:37 +01:00
Zaiming Shi
17d70772a8 refactor(emqx_recon): Use latest version recon
Moved recon dependency from emqx_recon to root
2021-01-23 11:42:28 +01:00
Zaiming Shi
c1b1ddbb6f
Merge pull request #4032 from zmstone/chore-sync-apps-resync-4.2.6
chore(sync-apps): resync plugin apps from their 4.2.6 tag
2021-01-23 11:15:46 +01:00
Zaiming Shi
84e922205b
Merge pull request #4056 from emqx/dev/v4.3.0
Auto-pull-request-on-2021-01-22
2021-01-22 21:41:06 +01:00
Zaiming Shi
2c03bca6ae chore(auth_jwt): Upgrade to jose 1.11.1 prepare for OTP 23 2021-01-22 20:31:27 +01:00
Zaiming Shi
51050f702a chore(config): Insert a space after config comment '#' and key 2021-01-22 15:07:35 +01:00
Zaiming Shi
7bb590f1c7 refactor(auth_redis): delete backward-compatible code in config schema 2021-01-22 14:20:47 +01:00
Zaiming Shi
5d45325cb8 fix(conf): quote config values 2021-01-22 14:20:47 +01:00
Zaiming Shi
b9071394c4 Merge remote-tracking branch 'origin/dev/v4.3.0' into chore-merge-v430-to-v50 2021-01-21 23:53:12 +01:00
Yudai Kiyofuji
c6785b1a34
test(coap): add test on acl and connection discarding (#4039) 2021-01-21 11:03:06 +09:00
Yudai Kiyofuji
455f210b4c
feat(cuttlefish): use hocon as a parsing function (#4008)
* chore(conf): add quotation for hocon

* chore(conf): fix paths incompatible with hocon

* chore(conf): use hocon as parsing function

* chore(docker): add quotation to some env variables for hocon
2021-01-19 19:52:17 +09:00
Zaiming Shi
4103a7292a Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:45 +01:00
Zaiming Shi
be771f6cd9 fix(auth_pgsql): Make ssl_opts.versions backward compatible 2021-01-18 20:37:45 +01:00
Zaiming Shi
14ca914068 Merge branch 'resync-apps-from-426' into chore-sync-apps-resync-4.2.6 2021-01-18 20:37:26 +01:00
Zaiming Shi
86895ddc24 chore(sync-apps): sync emqx_auth_mnesia e4.2.3 2021-01-18 20:05:08 +01:00
Zaiming Shi
a2b4e50a8d chore(sync-apps): re-sync apps from dev/v4.3.0 branch 2021-01-18 19:24:08 +01:00
Zaiming Shi
fc0b912cde refactor(emqx_dashboard): www dir is to be downloaded at build time 2021-01-18 19:20:49 +01:00
tigercl
fd2e9f147b
fix(auth http): using ehttpc (#4021)
* fix(auth http): using ehttpc

* chore(ehttpc): update tag of ehttpc

* fix(config): update comment
2021-01-16 23:10:53 +08:00
wwhai
a6de90c3f9
fix(test): add two way ssl test (#4025) 2021-01-16 22:28:15 +08:00
turtleDeng
2751fa6a41 fix(scheme): update emqx_web_hook_actions.erl 2021-01-16 22:25:12 +08:00
zhouzb
bf84686b76 chore(ehttpc): update tag of ehttpc 2021-01-16 22:25:12 +08:00
zhouzb
9f0dbeff29 fix(webhook): fix ipv6 in ip and hostname 2021-01-16 22:25:12 +08:00