root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Michael Klishin 2016-09-15 22:13:57 +03:00
parent 0ca63e9ceb ddaa0e9dc9
commit 06ddafc891
No known key found for this signature in database
GPG Key ID: E80EDCFA0CDB21EE
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rabbit_mirror_queue_coordinator.erl
View File

@ -363,7 +363,7 @@ handle_cast({gm_deaths, DeadGMPids},
%% NOTE: Reported deaths here, could be inconsistant.
rabbit_mirror_queue_misc:report_deaths(MPid, false, QueueName,
DeadPids),
{stop, normal, State};
{stop, shutdown, State};
{error, not_found} ->
{stop, normal, State}
end;

8
test/unit_inbroker_SUITE.erl
View File

@ -1684,15 +1684,15 @@ credit_flow_settings(Config) ->
credit_flow_settings1(_Config) ->
%% default values
passed = test_proc(200, 50),
passed = test_proc(200, 100),
application:set_env(rabbit, credit_flow_default_credit, {100, 20}),
passed = test_proc(100, 20),
application:set_env(rabbit, credit_flow_default_credit, {100, 300}),
passed = test_proc(100, 300),
application:unset_env(rabbit, credit_flow_default_credit),
% back to defaults
passed = test_proc(200, 50),
passed = test_proc(200, 100),
passed.
test_proc(InitialCredit, MoreCreditAfter) ->