Merge branch 'master' into rabbitmq-server-1303

Author: michaelklishin

.travis.yml

@@ -19,8 +19,8 @@ addons:
       - elixir
       - xsltproc
 otp_release:
-  - "18.3"
-  - "19.0"
+  - "19.2"
+  - "19.3"
 services:
   - docker
 env:

src/rabbit_connection_tracking.erl

@@ -217,7 +217,7 @@ list_on_node(Node) ->
     catch exit:{aborted, {no_exists, _}} -> []
     end.
 
--spec list_on_node(node(), rabbit_types:vhsot()) -> [rabbit_types:tracked_connection()].
+-spec list_on_node(node(), rabbit_types:vhost()) -> [rabbit_types:tracked_connection()].
 
 list_on_node(Node, VHost) ->
     try mnesia:dirty_match_object(

src/rabbit_variable_queue.erl

@@ -2917,7 +2917,7 @@ run_old_persistent_store(Refs, StartFunState) ->
     OldStoreName.
 
 start_new_store(VHosts) ->
-    %% Ensure vhost supervisor is started, so we can add vhsots to it.
+    %% Ensure vhost supervisor is started, so we can add vhosts to it.
     lists:map(fun(VHost) ->
         VHostDir = rabbit_vhost:msg_store_dir_path(VHost),
         {ok, Pid} = rabbit_msg_store:start_link(?PERSISTENT_MSG_STORE,