Commit Graph

233 Commits

Author SHA1 Message Date
Zaiming Shi 1715b87dce chore: move root level src, test, include, priv and etc to apps/emqx 2021-06-07 09:09:28 +02:00
Zaiming (Stone) Shi 65a660aaea
Merge pull request #4903 from emqx/resolve-master-dev/v5.0-conflict-release-version
Auto-pull-request-on-2021-05-31
2021-06-05 15:31:21 +02:00
Zaiming (Stone) Shi ee48c961d0
Merge branch 'dev/v5.0' into license-conf 2021-06-05 13:18:58 +02:00
Zaiming (Stone) Shi 5dab6985c1
Merge branch 'dev/v5.0' into resolve-master-dev/v5.0-conflict-release-version 2021-06-05 11:51:02 +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
Zaiming Shi f7bd206b9b chore: pin cuttlefish 4.0.1 2021-06-02 14:18:00 +02:00
z8674558 52e69b20b4 chore(rebar.config): bump hocon; no more unused import 2021-06-02 16:55:26 +09:00
z8674558 9cb2facfe1 chore(emqx_resource): unify dependency hocon to root rebar.config 2021-06-01 21:05:04 +09:00
Zaiming Shi b485c75266 fix: emqtt performance
emqtt 1.2.3.1 has the fix for big binary concatenation performance
2021-06-01 17:29:16 +08:00
z8674558 4b174b0277 feat(conf): use hocon schema 2021-06-01 17:05:52 +09:00
Zaiming (Stone) Shi 913420588d
Merge branch 'dev/v5.0' into resolve-conflict-to-5.0 2021-05-31 09:17:21 +02:00
DDDHuang 9d1f6ccc4b chore: ekka support etcd v3 2021-05-31 09:07:52 +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
k32 812faf08a1 chore(logger): Update snabbkaffe to 0.13.0 2021-05-25 21:15:59 +02:00
z8674558 31cbb7aa97 Merge branch 'master' of github.com:emqx/emqx into merge-master 2021-05-25 12:50:50 +09:00
Zaiming Shi e82e24d21f fix: pin cuttlefish v3.3.5
this cuttlefish release has only changes in a test module
2021-05-24 15:15:37 +02:00
zhouzb 09f51e51bd chore(update dep): update right tag for ehttpc 2021-05-14 19:27:04 +08:00
zhouzb c6771a57b6 chore(update dep): update dep of ehttpc 2021-05-14 19:27:04 +08:00
Zaiming Shi 814588d1c8 Merge remote-tracking branch 'origin/master' into resolve-conflict-master-to-v5.0 2021-05-07 22:24:38 +02:00
Zaiming Shi ec69e51386 build: pin cuttlefish v4.0.0 (hocon) 2021-05-07 21:46:04 +02:00
zhanghongtong 6595d53962 build(relup): update build script for support relup 2021-05-07 21:25:10 +02:00
Zaiming Shi 30c214d64b build: fix relup hook point name 2021-05-07 14:04:15 +02:00
z8674558 3c4e95a246 chore(rebar.config): cuttlefish 3.3.3 -> 3.3.4 2021-05-07 10:41:03 +00:00
Zaiming Shi d904a1048b Merge remote-tracking branch 'origin/master' into merge-master-to-dev/v5.0 2021-04-30 15:09:31 +02:00
wwhai 4facf4afe0 fix(deps): change ecpool to 0.5.1 2021-04-28 09:50:31 +08:00
k32 6d4da4a01a chore(snabbkaffe): Update version to 0.12.0 2021-04-26 14:20:52 +02:00
wwhai 92e8ba574c fix(deps): update ecpool to 0.5.2 2021-04-26 15:15:30 +08:00
Shawn ab5b4beffe fix(gen_rpc): the port discovery not working on a large offset 2021-04-25 13:58:33 +08:00
Zaiming Shi dad7d9c597 fix(config): pin cuttlefish 3.3.3
to be backward compatible to 4.2.x
cuttlefish 3.3.3 includes a fix to handle empty string
environment variable translated to 'undefined', but not `""`
2021-04-19 08:39:26 +02:00
zhouzb 9bedd1bb4f chore(ehttpc): update tag of ehttpc 2021-04-15 21:47:20 +08:00
Zaiming Shi 0a092c8ba0 chore(build): pin ekka 0.8.1
wait mnesia table
2021-04-13 19:38:34 +02:00
zhanghongtong be36e51f6e feat(redis): redis sentinel support ssl connect 2021-04-13 14:42:08 +08:00
z8674558 b0c3c713b5 Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-13 00:09:17 +09:00
z8674558 d010830de8 chore(rebar.config): bump cuttlefish 2021-04-12 07:30:02 +00:00
Zaiming Shi 2a9a5e74d7 fix(bin/emqx): print cuttlefish error 2021-04-10 08:48:13 +00:00
Yudai Kiyofuji e3a5f65c88
feat(config): print override env (#4517) 2021-04-09 16:28:01 +02:00
Zaiming Shi d033d71982 chore(build): Pin snabbkaffe 0.10.0 2021-04-08 00:02:27 +02:00
z8674558 62f1bd8120 chore(rebar.config): use z8674558/cuttlefish temporalily 2021-04-07 20:29:53 +09:00
z8674558 971e6ca90e Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-07 20:29:08 +09:00
z8674558 9db5452b6c refactor(emqx.schema): use override_env to support alternative env 2021-04-05 17:04:01 +09:00
z8674558 299d489ef9 refactor(bin/emqx): use cuttlefish `get` to get values from .conf 2021-04-02 08:42:58 +02:00
Zaiming Shi 236f75b33b chore(rebar.config): Snabbkaffee should be a default dependency 2021-03-30 10:08:13 +02:00
Karol Kaczmarek ac7d097f16 chore(deps): minirest 0.3.5 2021-03-20 15:21:31 +01:00
Zaiming Shi 8e45fa1c8b feat(observer_cli): Add observer_cli 2021-03-13 18:50:18 +01:00
Zaiming Shi 5f064a8e42 chore(test): enable cover only when necessary
So that ad-hoc ./rebar3 eunit and ct can run faster
2021-03-11 19:06:03 +01:00
z8674558 efd4ef8091 Merge branch 'dev/v5.0' of private:emqx/emqx into fix-merge-conflict-master-to-5.0 2021-03-04 22:12:09 +09:00
Zaiming Shi 6fb5c9de42 chore(deps): upgrade replayq to version 0.3.2 2021-03-02 18:10:26 +01:00
Zaiming Shi dd06d70bce refactor(build): Move parse_transform module to root app
So we do not have to workaround the compile order issue
2021-03-02 08:40:19 +08:00