Merge branch 'dev'

2015-02-12 22:01:08 +08:00 · 2015-02-12 22:01:08 +08:00 · b392c040c1
parent 47ae8914b4 db6d9cc49b
commit b392c040c1
2 changed files with 9 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,8 @@
+language: erlang
+
+otp_release:
+   - 17.0
+
+script: 
+  - make
+
--- a/apps/emqtt/src/emqtt_sm.erl
+++ b/apps/emqtt/src/emqtt_sm.erl
@ -147,7 +147,7 @@ handle_cast(_Msg, State) ->
    {noreply, State}.

 handle_info({'DOWN', MRef, process, DownPid, _Reason}, State) ->
-	ets:match_delete(emqtt_client, {{'_', DownPid, MRef}}),
+	ets:match_delete(?TABLE, {{'_', DownPid, MRef}}),
    {noreply, State};

 handle_info(_Info, State) ->