diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-07-28 14:03:23 -0700 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-07-28 14:03:23 -0700 |
| commit | 1df9b98f35fddf5d6af47d79fbd015980b71cf8e (patch) | |
| tree | 4beb1404a0bc97451e0ff1d85341671cc7f34d3a | |
| parent | d43bc0e408d1c2a89df399840e072fc427176c2c (diff) | |
| parent | d15c03f1e1467198c7cb9649e0bd7ec900b744f0 (diff) | |
| download | rabbitmq-server-git-1df9b98f35fddf5d6af47d79fbd015980b71cf8e.tar.gz | |
Merge branch 'master' into rabbitmq-server-1303
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | src/rabbit_connection_tracking.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 9bf4bd3396..7a46f085b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ addons: - elixir - xsltproc otp_release: - - "18.3" - - "19.0" + - "19.2" + - "19.3" services: - docker env: diff --git a/src/rabbit_connection_tracking.erl b/src/rabbit_connection_tracking.erl index 27c4bff810..30932bb1b0 100644 --- a/src/rabbit_connection_tracking.erl +++ b/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( diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index dd08916e35..b4945fe3d3 100644 --- a/src/rabbit_variable_queue.erl +++ b/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, |