aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/doc/src
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2017-06-14 09:30:30 +0200
committerAnders Svensson <[email protected]>2017-06-14 09:30:30 +0200
commit5ef0555f4a696e6cc5a927bc6d8f469a725c0ef1 (patch)
treeb743c631806fd4e86343cd8232fcaf7da53df531 /lib/diameter/doc/src
parent4850f0cae2c46d6584fe3926a715fe08eae25176 (diff)
parentc74b1c4a46c71bd3b258477ca4bf1b5d39c5095e (diff)
downloadotp-5ef0555f4a696e6cc5a927bc6d8f469a725c0ef1.tar.gz
otp-5ef0555f4a696e6cc5a927bc6d8f469a725c0ef1.tar.bz2
otp-5ef0555f4a696e6cc5a927bc6d8f469a725c0ef1.zip
Merge branch 'anders/diameter/capx_vs_dpr/OTP-14338'
* anders/diameter/capx_vs_dpr/OTP-14338: Let candidate peers be passed to diameter:call/4 Comment on RFC ambiguity regarding application identifiers Remove trailing whitespace
Diffstat (limited to 'lib/diameter/doc/src')
-rw-r--r--lib/diameter/doc/src/diameter.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 72181a42b0..2cbe48ecce 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -21,7 +21,7 @@
<copyright>
<year>2011</year>
-<year>2016</year>
+<year>2017</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -300,6 +300,17 @@ corresponding list of filters.
Defaults to <c>none</c>.</p>
</item>
+<tag><c>{peer, &app_peer_ref;}</c></tag>
+<item>
+<p>
+Peer to which the request in question can be sent, preempting the
+selection of peers having advertised support for the Diameter
+application in question.
+Multiple options can be specified, and their order is
+respected in the candidate lists passed to a subsequent
+&app_pick_peer; callback.</p>
+</item>
+
<tag><c>{timeout, &dict_Unsigned32;}</c></tag>
<item>
<p>