diff options
author | Anders Svensson <[email protected]> | 2017-09-03 13:32:20 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2017-09-03 13:32:20 +0200 |
commit | aa71291f765e901d7816e2399a3f3d55d41d06c9 (patch) | |
tree | cc6aed4ad3ad6558ebc61c7288e1d5b5d404e593 /lib/diameter/src/base/diameter_watchdog.erl | |
parent | a2518cf009a2c2f7c156bbfe8ff65ceb8dc09a6a (diff) | |
parent | 70b228f55a34a29f0019ab22affa9f0b70acdabf (diff) | |
download | otp-aa71291f765e901d7816e2399a3f3d55d41d06c9.tar.gz otp-aa71291f765e901d7816e2399a3f3d55d41d06c9.tar.bz2 otp-aa71291f765e901d7816e2399a3f3d55d41d06c9.zip |
Merge branch 'anders/diameter/decode_format/OTP-14511' into maint
* anders/diameter/decode_format/OTP-14511:
Map less in traffic suite
Fix decode_format doc oversights
Rename decode_format false to none
Tweak {decode_format, false} semantics
Fix dialyzer spec
Diffstat (limited to 'lib/diameter/src/base/diameter_watchdog.erl')
-rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl index bb671e9860..c08e2da672 100644 --- a/lib/diameter/src/base/diameter_watchdog.erl +++ b/lib/diameter/src/base/diameter_watchdog.erl @@ -72,7 +72,7 @@ restrict := boolean(), suspect := non_neg_integer(), %% OKAY -> SUSPECT okay := non_neg_integer()}, %% REOPEN -> OKAY - codec :: #{decode_format := false, + codec :: #{decode_format := none, string_decode := false, strict_arities => diameter:strict_arities(), strict_mbit := boolean(), @@ -157,7 +157,7 @@ i({Ack, T, Pid, {Opts, string_decode, rfc, ordered_encode], - SvcOpts#{decode_format := false, + SvcOpts#{decode_format := none, string_decode := false, ordered_encode => false})}. |