aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2012-11-18 19:39:37 +0100
committerAnders Svensson <[email protected]>2012-11-18 19:39:37 +0100
commit071c225867e5ba13016d8d2401750e8f8a269c3d (patch)
tree7b9247d6db3a495a7434e1335f00a9b87cb728fb /lib/diameter/src/base/diameter.erl
parent67bb449ebc3e51a39c73b04eefb25feba6e1aa1e (diff)
parent41d6a59fb11c65da9edcf97551b19cbdbf00646f (diff)
downloadotp-071c225867e5ba13016d8d2401750e8f8a269c3d.tar.gz
otp-071c225867e5ba13016d8d2401750e8f8a269c3d.tar.bz2
otp-071c225867e5ba13016d8d2401750e8f8a269c3d.zip
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter.erl')
-rw-r--r--lib/diameter/src/base/diameter.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 3e3a6be0ef..8f9901907a 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -330,6 +330,8 @@ 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'()}
| {private, any()}.