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 00:36:10 +08:00
parent 1b957e998f c8e9483ad6
commit a556fe72aa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -28,8 +28,8 @@ EUNIT_OPTS = verbose
# EUNIT_ERL_OPTS = # EUNIT_ERL_OPTS =
CT_SUITES = emqttd emqttd_access emqttd_lib emqttd_mod emqttd_net \ CT_SUITES = emqttd emqttd_access emqttd_lib emqttd_mod emqttd_net \
emqttd_mqueue emqttd_protocol emqttd_topic emqttd_trie \ emqttd_mqueue emqttd_protocol emqttd_topic emqttd_trie \
emqttd_vm emqttd_vm
CT_OPTS = -cover test/ct.cover.spec -erl_args -name emqttd_ct@127.0.0.1 CT_OPTS = -cover test/ct.cover.spec -erl_args -name emqttd_ct@127.0.0.1
@ -41,3 +41,4 @@ app:: rebar.config
app.config:: app.config::
cuttlefish -l info -e etc/ -c etc/emq.conf -i priv/emq.schema -d data/ cuttlefish -l info -e etc/ -c etc/emq.conf -i priv/emq.schema -d data/