Commit Graph

5712 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi
ee48c961d0
Merge branch 'dev/v5.0' into license-conf 2021-06-05 13:18:58 +02:00
Zaiming (Stone) Shi
5052b26c7f
Merge pull request #4937 from zmstone/chore-use-http-lib-deps
chore(http_lib): use lib app
2021-06-05 13:17:33 +02:00
Zaiming (Stone) Shi
aac4dbd998
Merge pull request #4938 from zmstone/fix-app-versions-check
chore: fix app versions and check script
2021-06-05 11:40:54 +02:00
Zaiming Shi
5795bcca6a chore: fix app versions and check script 2021-06-05 11:09:13 +02:00
Zaiming Shi
da6a8e3991 chore(http_lib): use lib app 2021-06-05 10:45:38 +02:00
z8674558
9c6276a654 chore(bin/emqx): support license conf option 2021-06-04 22:10:16 +09:00
z8674558
b4eb0c4df6 chore(bin/emqx): use hocon get 2021-06-03 17:03:08 +09:00
Shawn
9617b65d52 fix(dialyzer): incorrect function spec 2021-06-03 13:35:57 +08:00
Shawn
03519d7e61 fix(emqx_resource): HTTP APIs for emqx_resource not working 2021-06-03 13:35:57 +08:00
Zaiming (Stone) Shi
624c4ecedc
Merge pull request #4917 from zmstone/update-cuttlefish
chore: pin cuttlefish 4.0.1
2021-06-02 16:09:44 +02:00
Zaiming Shi
f7bd206b9b chore: pin cuttlefish 4.0.1 2021-06-02 14:18:00 +02:00
Zaiming (Stone) Shi
3c43b78749
Merge pull request #4910 from z8674558/no-import-warning
chore(rebar.config): bump hocon; no more unused import
2021-06-02 12:55:27 +02:00
z8674558
52e69b20b4 chore(rebar.config): bump hocon; no more unused import 2021-06-02 16:55:26 +09:00
Zaiming (Stone) Shi
ea396f4f86
Merge pull request #4861 from z8674558/hocon-schema
feat(conf): use hocon schema
2021-06-01 14:21:27 +02:00
z8674558
9cb2facfe1 chore(emqx_resource): unify dependency hocon to root rebar.config 2021-06-01 21:05:04 +09:00
z8674558
ad1ef732ae chore(emqx_schema): suppress dialyzer warnings temporarily 2021-06-01 17:06:09 +09:00
z8674558
47f7b35a60 chore(bin/emqx): add todo on hocon 2021-06-01 17:06:09 +09:00
z8674558
a9efdaeacd fix(emqx_rule_engine_SUITE): use emqx_ct_helpers:read_schema_configs 2021-06-01 17:06:09 +09:00
z8674558
e12a629498 feat(emqx_schema): add ssl field generator 2021-06-01 17:06:09 +09:00
Zaiming Shi
5546d24b6d refactor: always use hocon to generate config
previously we supports skipping config generation if USE_CUTTLEFISH
not set to true.
it has never been tested (at least not in automated tests)
now it's time to drop it.
2021-06-01 17:06:09 +09:00
z8674558
4b174b0277 feat(conf): use hocon schema 2021-06-01 17:05:52 +09:00
z8674558
d61e931d88 fix(emqx_logger_jsonfmt): attribute import before function definitions 2021-05-31 22:47:00 +09:00
Zaiming (Stone) Shi
70d2e0e905
Merge pull request #4768 from emqx/resolve-conflict-to-5.0
Auto-pull-request-on-2021-05-08
2021-05-31 10:09:25 +02:00
Zaiming (Stone) Shi
913420588d
Merge branch 'dev/v5.0' into resolve-conflict-to-5.0 2021-05-31 09:17:21 +02:00
JianBo He
3a89b1f00b
chore(action): fix syntax error (#4885) 2021-05-31 15:08:52 +08:00
Rory Z
7040fb7835
Merge pull request #4893 from terry-xiaoyu/emqx_resource
feat(emqx_resource): add behaviour emqx_resource
2021-05-31 14:17:01 +08:00
Shawn
696d4a4e58 fix(emqx_resource): some dialyzer complaints 2021-05-31 12:14:25 +08:00
Zaiming Shi
818a7e9772 build: use base rebar.conf when emqx.git is as dependency 2021-05-31 11:55:03 +08:00
Shawn
d7755df48b feat(emqx_resource): make with emqx 2021-05-31 10:51:27 +08:00
DDDHuang
9d1f6ccc4b chore: ekka support etcd v3 2021-05-31 09:07:52 +08:00
Zaiming Shi
387d7f5913 chore(pkg-vsn.sh): add some comments 2021-05-30 10:27:54 +02:00
zhanghongtong
52a933f113 chore(CI): fix relup error 2021-05-29 11:45:52 +08:00
Turtle
cf4cbc1677 fix(API): fix get used memory error 2021-05-29 11:42:50 +08:00
JianBo He
7b43a23734 fix(schema): fix locking strategy typos 2021-05-29 11:32:29 +08:00
Shawn
bc83bed7e8 feat(emqx_resource): add licence headers to source code files 2021-05-28 22:02:33 +08:00
Shawn
2a31c43e0d feat(emqx_resource): add behaviour emqx_resource 2021-05-28 21:43:54 +08:00
JianBo He
78cdfdf0df fix(exhook): change default value to CONTINUE 2021-05-28 19:28:03 +08:00
Rory Z
11352c4eaa
chore(ci): use cache for macos in slim build (#4883) 2021-05-28 09:57:55 +08:00
Zaiming Shi
f2262469cc build: pin gpb 4.11.2
gpb is only to compile protobuf,
it is not included in release tarball.
for some reason rebar3 fetches an unknown version without this pin
2021-05-27 19:38:51 +02:00
zhanghongtong
a7d3dced5e chore(ci): ensure rebar3 in actions 2021-05-27 21:50:03 +08:00
Zaiming Shi
0424200978 build: ensure rebar3 in PATH for build_packages action 2021-05-27 12:42:21 +02:00
zhanghongtong
96466aba40 chore(release): update emqx release version 2021-05-27 17:54:50 +08:00
tigercl
1340e8c16e
Merge pull request #4874 from Rory-Z/fix/fix-issue-#4815
fix(ws connect): fix ws connect with Proxy Protocol capture wrong client-ip
2021-05-27 16:40:56 +08:00
Rory-Z
231c800f40 fix(ws connect): fix ws connect with Proxy Protocol capture wrong client-ip 2021-05-27 08:18:34 +00:00
Zaiming Shi
1ab5909be3 build: use direct download link to get opensource dashboard 2021-05-27 16:18:17 +08:00
Zaiming Shi
925aa55951 build: add back macos erlang install cache 2021-05-27 16:18:17 +08:00
Zaiming Shi
0ac3e6e0ce build: ensure rebar3 in PATH 2021-05-27 16:18:17 +08:00
Zaiming Shi
1e2bd2610f feat(emqx_connection): async_set_keepalive defaults to self() 2021-05-27 16:18:17 +08:00
Zaiming (Stone) Shi
ead084aa68
Merge pull request #4873 from turtleDeng/fix/emqx-appup
fix(appup): update appup
2021-05-27 09:24:31 +02:00
Turtle
c02a9f0101 fix(appup): update appup 2021-05-27 13:55:07 +08:00