Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20

Makefile

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

src/emqttd_session.erl

@@ -336,12 +336,10 @@ handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client
     ?LOG(warning, "destroyed", [], Session),
     shutdown(destroy, Session);
 
-%% 
 handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = OldClientPid}) ->
-    ?LOG(warning, "kicked out~p", [OldClientPid], Session),
+    ?LOG(warning, "kickout ~p", [OldClientPid], Session),
     shutdown(conflict, Session);
 
-
 handle_cast({resume, ClientId, ClientPid}, Session = #session{client_id      = ClientId,
                                                               client_pid     = OldClientPid,
                                                               clean_sess     = CleanSess,