Skip to content

Commit

Permalink
Merge pull request #70 from rabbitmq/update-to-ra-2.0.5
Browse files Browse the repository at this point in the history
Update to Ra 2.0.5
  • Loading branch information
dumbbell authored Mar 23, 2022
2 parents b281615 + 66b7344 commit fc6b6ea
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{minimum_otp_vsn, "23.0"}.

%% Dependency pinning must be updated in mix.exs too.
{deps, [{ra, "2.0.4"}]}.
{deps, [{ra, "2.0.5"}]}.

{project_plugins, [rebar3_proper,
rebar3_hex,
Expand Down
6 changes: 3 additions & 3 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{"1.2.0",
[{<<"aten">>,{pkg,<<"aten">>,<<"0.5.7">>},1},
{<<"gen_batch_server">>,{pkg,<<"gen_batch_server">>,<<"0.8.7">>},1},
{<<"ra">>,{pkg,<<"ra">>,<<"2.0.4">>},0}]}.
{<<"ra">>,{pkg,<<"ra">>,<<"2.0.5">>},0}]}.
[
{pkg_hash,[
{<<"aten">>, <<"F88EB38CEADC0710B84B5D78F0357D766733D80902D50AC69B70CDF834992DAA">>},
{<<"gen_batch_server">>, <<"1D91A3605D3110EC791F00D5968E86E62FD4C6979E760796A51D50A7ACC7A40D">>},
{<<"ra">>, <<"9EF24AF930C699BCCB12516CA91DB8255093E4DF560BAF54C65D45372E73639E">>}]},
{<<"ra">>, <<"F11059B6F7DEA5EBE04E4C14B865969FC1F5346DD85136E6DC1B7AC96ED0CF0D">>}]},
{pkg_hash_ext,[
{<<"aten">>, <<"8B623C8BE27B59A911D16AB0AF41777B504C147BC0D60A29015FAB58321C04B0">>},
{<<"gen_batch_server">>, <<"94A49A528486298B009D2A1B452132C0A0D68B3E89D17D3764CB1EC879B7557A">>},
{<<"ra">>, <<"8E3550BE1DF23B5B1BA9D02E0C8C79FEBB8EAE8A6DCBBBA746BD5180F39AEE1C">>}]}
{<<"ra">>, <<"D793BDB8DB412472355A6F11FA26EDA019380D4DAAF8B08595D96972F76BEEE0">>}]}
].
10 changes: 3 additions & 7 deletions src/khepri_machine.erl
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,11 @@
%% This is used when the tree is walked back up to determine the list of tree
%% nodes to remove after some keep_while condition evaluates to false.

-type ra_server_command_priority() :: normal | low.
%% Redefines `ra_server:command_priority()' while there is no release of Ra
%% defining it.

-type async_option() :: boolean() |
ra_server:command_correlation() |
ra_server_command_priority() |
ra_server:command_priority() |
{ra_server:command_correlation(),
ra_server_command_priority()}.
ra_server:command_priority()}.
%% Option to indicate if the command should be synchronous or asynchronous.
%%
%% Values are:
Expand Down Expand Up @@ -892,7 +888,7 @@ process_async_command(StoreId, Command, Correlation, Priority) ->
Options :: command_options(),
CommandType :: sync | {async, Correlation, Priority},
Correlation :: ra_server:command_correlation(),
Priority :: ra_server_command_priority().
Priority :: ra_server:command_priority().
%% @doc Selects the command type depending on what the caller wants.
%%
%% @private
Expand Down

0 comments on commit fc6b6ea

Please sign in to comment.