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_config.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_config.erl')
| -rw-r--r-- | lib/diameter/src/base/diameter_config.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_config.erl b/lib/diameter/src/base/diameter_config.erl index 6fc4277ac8..284f885884 100644 --- a/lib/diameter/src/base/diameter_config.erl +++ b/lib/diameter/src/base/diameter_config.erl @@ -588,8 +588,7 @@ opt(service, {K, false}) K == use_shared_peers; K == monitor; K == restrict_connections; - K == strict_arities; - K == decode_format -> + K == strict_arities -> true; opt(service, {K, true}) @@ -602,6 +601,7 @@ opt(service, {decode_format, T}) when T == record; T == list; T == map; + T == none; T == record_from_map -> true; |