diff options
| author | Anders Svensson <[email protected]> | 2017-03-08 14:06:46 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2017-03-08 14:06:46 +0100 |
| commit | 12d5349834f552ec9cb6ad0d51f53810acc8d51f (patch) | |
| tree | a86aad751893e69e29e99f5f0b437b8ab1632df0 /lib/diameter/src/base/diameter_config.erl | |
| parent | 6ed06cfeccfa97fcb98c61e6225ffdc7d79dfd14 (diff) | |
| parent | b232c720a69bd12717ef880f5ee8ac696c4514f0 (diff) | |
| download | otp-12d5349834f552ec9cb6ad0d51f53810acc8d51f.tar.gz otp-12d5349834f552ec9cb6ad0d51f53810acc8d51f.tar.bz2 otp-12d5349834f552ec9cb6ad0d51f53810acc8d51f.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index 1b48c0431f..e10804c931 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2016. All Rights Reserved. +%% Copyright Ericsson AB 2010-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -580,6 +580,9 @@ opt({K, Tmo}) K == dpa_timeout -> ?IS_UINT32(Tmo); +opt({capx_strictness, B}) -> + is_boolean(B); + opt({length_errors, T}) -> lists:member(T, [exit, handle, discard]); |