diff options
| author | Anders Svensson <[email protected]> | 2015-03-24 11:03:23 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2015-03-24 11:03:23 +0100 |
| commit | 8cad0980fd09b36fe71ee91dd65e56fadb5a22b8 (patch) | |
| tree | f3e587be5a8c16ee7f133bfd08f546c001d91cdc /lib/diameter/src/base/diameter.erl | |
| parent | 487446e76102b27fa8df02a353c7fdeec2d091f1 (diff) | |
| parent | 79b86a035adb0068e544401104d4c04db8e2b181 (diff) | |
| download | otp-8cad0980fd09b36fe71ee91dd65e56fadb5a22b8.tar.gz otp-8cad0980fd09b36fe71ee91dd65e56fadb5a22b8.tar.bz2 otp-8cad0980fd09b36fe71ee91dd65e56fadb5a22b8.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter.erl b/lib/diameter/src/base/diameter.erl index a45d84f95b..67dfc7bdbf 100644 --- a/lib/diameter/src/base/diameter.erl +++ b/lib/diameter/src/base/diameter.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2014. All Rights Reserved. +%% Copyright Ericsson AB 2010-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -306,6 +306,7 @@ call(SvcName, App, Message) -> | {restrict_connections, restriction()} | {sequence, sequence() | evaluable()} | {share_peers, remotes()} + | {string_decode, boolean()} | {use_shared_peers, remotes()} | {spawn_opt, list()}. @@ -343,6 +344,7 @@ call(SvcName, App, Message) -> | {capabilities_cb, evaluable()} | {capx_timeout, 'Unsigned32'()} | {disconnect_cb, evaluable()} + | {dpr_timeout, 'Unsigned32'()} | {dpa_timeout, 'Unsigned32'()} | {length_errors, exit | handle | discard} | {connect_timer, 'Unsigned32'()} |