Merge pull request #1224 from emqtt/emq24

Fix issue#1221

.gitignore

@@ -30,3 +30,4 @@ _build
 .rebar3
 rebar3.crashdump
 .DS_Store
+rebar.config

.travis.yml

@@ -1,11 +1,9 @@
 language: erlang
 
 otp_release:
-   - 19.0
+   - 20.0
-   - 19.1
-   - 19.2
 
-script: 
+script:
   - make
 
 sudo: false

Makefile

@@ -15,7 +15,7 @@ dep_pbkdf2       = git https://github.com/emqtt/pbkdf2 2.0.1
 dep_lager_syslog = git https://github.com/basho/lager_syslog
 dep_bcrypt       = git https://github.com/smarkets/erlang-bcrypt master
 dep_clique       = git https://github.com/emqtt/clique
-dep_jsx           = git https://github.com/talentdeficit/jsx
+dep_jsx          = git https://github.com/talentdeficit/jsx
 
 ERLC_OPTS += +debug_info
 ERLC_OPTS += +'{parse_transform, lager_transform}'

rebar.config

@@ -1,4 +0,0 @@
-{deps, [
-{goldrush,".*",{git,"https://github.com/basho/goldrush","0.1.9"}},{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{ekka,".*",{git,"https://github.com/emqtt/ekka","develop"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb","master"}},{pbkdf2,".*",{git,"https://github.com/emqtt/pbkdf2","2.0.1"}},{lager_syslog,".*",{git,"https://github.com/basho/lager_syslog",""}},{bcrypt,".*",{git,"https://github.com/smarkets/erlang-bcrypt","master"}}
-]}.
-{erl_opts, [debug_info,{parse_transform,lager_transform}]}.