aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-03-19 13:35:54 +0100
committerAnders Svensson <[email protected]>2013-03-19 13:35:54 +0100
commitf285ee66678ae8761dc82b5ba0c023dd759091fc (patch)
tree8f191915385a3ff600b6b130dd38bcb164bbfad6 /lib/diameter/src/base/diameter.erl
parent692fa53631d5c977cc5e7635ce1df4e39d224116 (diff)
parente173bc1b28453f0edb4863677f3c730b3d7a9f91 (diff)
downloadotp-f285ee66678ae8761dc82b5ba0c023dd759091fc.tar.gz
otp-f285ee66678ae8761dc82b5ba0c023dd759091fc.tar.bz2
otp-f285ee66678ae8761dc82b5ba0c023dd759091fc.zip
Merge branch 'maint-r16' into maint
Diffstat (limited to 'lib/diameter/src/base/diameter.erl')
-rw-r--r--lib/diameter/src/base/diameter.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 189f2b01b9..490a1fa8aa 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -344,6 +344,7 @@ call(SvcName, App, Message) ->
| {length_errors, exit | handle | discard}
| {reconnect_timer, 'Unsigned32'()}
| {watchdog_timer, 'Unsigned32'() | {module(), atom(), list()}}
+ | {watchdog_config, [{okay|suspect, non_neg_integer()}]}
| {private, any()}.
%% Predicate passed to remove_transport/2