yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
zhanghongtong 2019-04-01 09:14:28 +08:00
parent 127427b783 8be2defb6b
commit 79e37cba0d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -9,7 +9,7 @@ dep_jsx = git-emqx https://github.com/talentdeficit/jsx 2.9.0
dep_gproc = git-emqx https://github.com/uwiger/gproc 0.8.0 dep_gproc = git-emqx https://github.com/uwiger/gproc 0.8.0
dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1 dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1
dep_esockd = git-emqx https://github.com/emqx/esockd v5.4.4 dep_esockd = git-emqx https://github.com/emqx/esockd v5.4.4
dep_ekka = git-emqx https://github.com/emqx/ekka v0.5.3 dep_ekka = git-emqx https://github.com/emqx/ekka v0.5.4
dep_cowboy = git-emqx https://github.com/ninenines/cowboy 2.6.1 dep_cowboy = git-emqx https://github.com/ninenines/cowboy 2.6.1
dep_replayq = git-emqx https://github.com/emqx/replayq v0.1.1 dep_replayq = git-emqx https://github.com/emqx/replayq v0.1.1

2
rebar.config
View File

@ -7,7 +7,7 @@
%% appended to deps in rebar.config.script %% appended to deps in rebar.config.script
{github_emqx_deps, {github_emqx_deps,
[{gen_rpc, "2.3.1"}, [{gen_rpc, "2.3.1"},
{ekka, "v0.5.3"}, {ekka, "v0.5.4"},
{replayq, "v0.1.1"}, {replayq, "v0.1.1"},
{esockd, "v5.4.4"}, {esockd, "v5.4.4"},
{cuttlefish, "v2.2.1"} {cuttlefish, "v2.2.1"}