diff options
| author | Anders Svensson <[email protected]> | 2013-12-02 09:45:10 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-12-02 09:45:10 +0100 |
| commit | 98a4eb6dd4dae98121da294a87bb5cf077b9efa7 (patch) | |
| tree | 8a74d88e99c9543eb06a70606e680ee425f6f795 /lib/diameter/src/base/diameter_config.erl | |
| parent | 324b1bd052d82d5579a780bcd7bf8c843720cb86 (diff) | |
| parent | 22ae0b2bd6fbe973915b19551c7d6a397a8c8a60 (diff) | |
| download | otp-98a4eb6dd4dae98121da294a87bb5cf077b9efa7.tar.gz otp-98a4eb6dd4dae98121da294a87bb5cf077b9efa7.tar.bz2 otp-98a4eb6dd4dae98121da294a87bb5cf077b9efa7.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index 34b40c3a29..f5ea459fd0 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -537,7 +537,9 @@ opt({capx_timeout, Tmo}) -> opt({length_errors, T}) -> lists:member(T, [exit, handle, discard]); -opt({reconnect_timer, Tmo}) -> +opt({K, Tmo}) + when K == reconnect_timer; %% deprecated + K == connect_timer -> ?IS_UINT32(Tmo); opt({watchdog_timer, {M,F,A}}) |