Commit Graph

16 Commits

Author SHA1 Message Date
z8674558 971e6ca90e Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-07 20:29:08 +09:00
JianBo He f08ddec296
Add server_name_indication and verify option (#4349)
Add server_name_indication and verify option
2021-03-23 19:48:04 +08:00
Zaiming Shi d11487268e Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0 2021-02-12 10:36:16 +01:00
JianBo He c3642c5c83 refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1 2021-02-04 15:32:08 +08:00
z8674558 e8729fb00e Merge branch 'dev/v5.0' of private:emqx/emqx into merge430 2021-01-29 17:11:12 +09:00
zhanghongtong 6a83cf3f35 chore(format): format some code 2021-01-28 19:18:18 +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 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 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 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 a2b4e50a8d chore(sync-apps): re-sync apps from dev/v4.3.0 branch 2021-01-18 19:24:08 +01:00
wwhai a6de90c3f9
fix(test): add two way ssl test (#4025) 2021-01-16 22:28:15 +08:00
zhanghongtong 9e03d6fea1 chore(auth): configuration format of unified authentication plug-in 2021-01-15 20:25:09 +08:00
bignullnull 981482d707
fix(test): fix test cases (#4012)
* fix(test): fix test cases
2021-01-15 09:48:57 +08:00
zhanghongtong 41afcde964 chore(ssl conf): update the ssl configuration format for mongo, pgsql, and redis plug-ins 2020-12-29 00:03:12 +08:00
Zaiming Shi 686c006d6e refactor(proj): Add apps 2020-12-04 22:11:53 +01:00