diff options
author | Anders Svensson <[email protected]> | 2015-03-20 02:22:38 +0100 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2015-03-20 02:22:38 +0100 |
commit | 67274e223333b8c59892085f7ca7c413ba908b20 (patch) | |
tree | a5e661a8ac1e4ac5c229ce2426358aca478e78ed /lib | |
parent | 8bccd7b8bf4e785c41d20f2010601c4f5a2db76a (diff) | |
parent | c0b559c6a0cf6fa9ff7215df59a71b7fa054ed85 (diff) | |
download | otp-67274e223333b8c59892085f7ca7c413ba908b20.tar.gz otp-67274e223333b8c59892085f7ca7c413ba908b20.tar.bz2 otp-67274e223333b8c59892085f7ca7c413ba908b20.zip |
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r-- | lib/diameter/test/diameter_config_SUITE.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl index ad5b3f9420..a4bba42b2b 100644 --- a/lib/diameter/test/diameter_config_SUITE.erl +++ b/lib/diameter/test/diameter_config_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013. All Rights Reserved. +%% Copyright Ericsson AB 2013-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -171,6 +171,9 @@ [[{suspect, 2}]]], [[x], [[{open, 0}]]]}, + {pool_size, + [[1], [100]], + [[0], [infinity], [-1], [x]]}, {private, [[x]], []}, |