aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base/diameter.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2012-08-29 16:25:26 +0200
committerAnders Svensson <[email protected]>2012-08-29 16:25:26 +0200
commita572c6ad38f2ab482e882102eeb9d63d22464699 (patch)
tree55edc3326b2138d8b382a4277ee1464f60ae2c53 /lib/diameter/src/base/diameter.erl
parentf3b7163813027e37951d82fed15c49fefa89f741 (diff)
parentf9732dbbfa30d0af503054775733779d8e556927 (diff)
downloadotp-a572c6ad38f2ab482e882102eeb9d63d22464699.tar.gz
otp-a572c6ad38f2ab482e882102eeb9d63d22464699.tar.bz2
otp-a572c6ad38f2ab482e882102eeb9d63d22464699.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, 1 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl
index 6703841f80..789a5db5f0 100644
--- a/lib/diameter/src/base/diameter.erl
+++ b/lib/diameter/src/base/diameter.erl
@@ -312,7 +312,7 @@ call(SvcName, App, Message) ->
-type transport_opt()
:: {transport_module, atom()}
| {transport_config, any()}
- | {transport_timeout, non_neg_integer() | infinity}
+ | {transport_config, any(), non_neg_integer() | infinity}
| {applications, [app_alias()]}
| {capabilities, [capability()]}
| {capabilities_cb, evaluable()}