diff options
| author | Anders Svensson <[email protected]> | 2012-11-18 19:39:11 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-11-18 19:39:11 +0100 |
| commit | 41d6a59fb11c65da9edcf97551b19cbdbf00646f (patch) | |
| tree | d7face87eb7188faafa4aecc321db4493778ec46 /lib/diameter/src/base/diameter.erl | |
| parent | 8134b7447050d9a6bd6b00fa30f4f7162bb342a9 (diff) | |
| parent | 23925103bfb66268113e533e701eb3865d6c1085 (diff) | |
| download | otp-41d6a59fb11c65da9edcf97551b19cbdbf00646f.tar.gz otp-41d6a59fb11c65da9edcf97551b19cbdbf00646f.tar.bz2 otp-41d6a59fb11c65da9edcf97551b19cbdbf00646f.zip | |
Merge branch 'anders/diameter/CEA_timeout/OTP-10554' into maint
* anders/diameter/CEA_timeout/OTP-10554:
Implement transport_opt() capx_timeout
Document transport_opt() capx_timeout
Minor doc fixes
Diffstat (limited to 'lib/diameter/src/base/diameter.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl index 95702f03d4..8f9901907a 100644 --- a/lib/diameter/src/base/diameter.erl +++ b/lib/diameter/src/base/diameter.erl @@ -330,6 +330,7 @@ call(SvcName, App, Message) -> | {applications, [app_alias()]} | {capabilities, [capability()]} | {capabilities_cb, evaluable()} + | {capx_timeout, 'Unsigned32'()} | {disconnect_cb, evaluable()} | {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}} | {reconnect_timer, 'Unsigned32'()} |