Merge emq20 branch

This commit is contained in:
Feng Lee 2017-03-27 09:36:42 +08:00
commit ec28773893
1 changed files with 6 additions and 2 deletions

View File

@ -1,6 +1,6 @@
[{<<"esockd">>, [{<<"esockd">>,
{git,"https://github.com/emqtt/esockd", {git,"https://github.com/emqtt/esockd",
{ref,"6ef597f16ce242fe37ae019d6ff5214f7a784c80"}}, {ref,"87d0d3b672e0f25e474f5f8298da568cbb6b168a"}},
0}, 0},
{<<"gen_logger">>, {<<"gen_logger">>,
{git,"https://github.com/emqtt/gen_logger.git", {git,"https://github.com/emqtt/gen_logger.git",
@ -24,7 +24,11 @@
0}, 0},
{<<"mochiweb">>, {<<"mochiweb">>,
{git,"https://github.com/emqtt/mochiweb", {git,"https://github.com/emqtt/mochiweb",
{ref,"af27c0c90bf4c1bfeae0290e4c541264b69f7168"}}, {ref,"c75d88e451b4fe26580a58223f645d99482f51af"}},
0},
{<<"pbkdf2">>,
{git,"https://github.com/comtihon/erlang-pbkdf2.git",
{ref,"7076584f5377e98600a7e2cb81980b2992fb2f71"}},
0}, 0},
{<<"syslog">>, {<<"syslog">>,
{git,"git://github.com/Vagabond/erlang-syslog", {git,"git://github.com/Vagabond/erlang-syslog",