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

Merge branch 'emq20'

This commit is contained in:
Feng 2016-10-19 10:50:53 +08:00
parent a556fe72aa 9b0deda679
commit 43ebd2e4ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -2,8 +2,8 @@ PROJECT = emqttd
PROJECT_DESCRIPTION = Erlang MQTT Broker PROJECT_DESCRIPTION = Erlang MQTT Broker
PROJECT_VERSION = 2.0 PROJECT_VERSION = 2.0
DEPS = gproc lager gen_logger esockd mochiweb getopt pbkdf2 \ DEPS = gproc lager gen_logger esockd mochiweb getopt pbkdf2
clique time_compat rand_compat ## clique time_compat rand_compat
dep_gproc = git https://github.com/uwiger/gproc dep_gproc = git https://github.com/uwiger/gproc
dep_getopt = git https://github.com/jcomellas/getopt v0.8.2 dep_getopt = git https://github.com/jcomellas/getopt v0.8.2
@ -11,10 +11,10 @@ dep_lager = git https://github.com/basho/lager master
dep_gen_logger = git https://github.com/emqtt/gen_logger dep_gen_logger = git https://github.com/emqtt/gen_logger
dep_esockd = git https://github.com/emqtt/esockd emq20 dep_esockd = git https://github.com/emqtt/esockd emq20
dep_mochiweb = git https://github.com/emqtt/mochiweb dep_mochiweb = git https://github.com/emqtt/mochiweb
dep_clique = git https://github.com/basho/clique #dep_clique = git https://github.com/basho/clique
dep_pbkdf2 = git https://github.com/basho/erlang-pbkdf2 2.0.0 dep_pbkdf2 = git https://github.com/basho/erlang-pbkdf2 2.0.0
dep_time_compat = git https://github.com/lasp-lang/time_compat #dep_time_compat = git https://github.com/lasp-lang/time_compat
dep_rand_compat = git https://github.com/lasp-lang/rand_compat #dep_rand_compat = git https://github.com/lasp-lang/rand_compat
TEST_DEPS = cuttlefish TEST_DEPS = cuttlefish
dep_cuttlefish = git https://github.com/emqtt/cuttlefish dep_cuttlefish = git https://github.com/emqtt/cuttlefish