diff options
| author | Anders Svensson <[email protected]> | 2013-12-02 09:43:55 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-12-02 09:43:55 +0100 |
| commit | 0f2458596200b5567b06c626254e2c3477ccfabf (patch) | |
| tree | b62cfcafe033cb9080c4b7d3ffea2369c22705ce /lib/diameter/src/base/diameter.erl | |
| parent | 2b8c7d30e6c24ebc4c8d78c16d8033ff0d6c106e (diff) | |
| parent | abea7186dd2590a0283396e94cf03dfb087277e5 (diff) | |
| download | otp-0f2458596200b5567b06c626254e2c3477ccfabf.tar.gz otp-0f2458596200b5567b06c626254e2c3477ccfabf.tar.bz2 otp-0f2458596200b5567b06c626254e2c3477ccfabf.zip | |
Merge branch 'anders/diameter/timer_confusion/OTP-11168' into maint
* anders/diameter/timer_confusion/OTP-11168:
Rename reconnect_timer -> connect_timer
Diffstat (limited to 'lib/diameter/src/base/diameter.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl index 77200cc7d0..d74e091e11 100644 --- a/lib/diameter/src/base/diameter.erl +++ b/lib/diameter/src/base/diameter.erl @@ -343,7 +343,7 @@ call(SvcName, App, Message) -> | {capx_timeout, 'Unsigned32'()} | {disconnect_cb, evaluable()} | {length_errors, exit | handle | discard} - | {reconnect_timer, 'Unsigned32'()} + | {connect_timer, 'Unsigned32'()} | {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}} | {watchdog_config, [{okay|suspect, non_neg_integer()}]} | {spawn_opt, list()} |