From 899120dd73724793c787db3227ecb1ba42c00381 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 27 Feb 2013 10:30:54 +0100
Subject: Add transport_opt() watchdog_config

To make the number of watchdogs sent before the transitions REOPEN ->
OKAY and OKAY -> SUSPECT configurable. Using anything other then the
default config is non-standard and should only be used for test.
---
 lib/diameter/doc/src/diameter.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'lib/diameter/doc')

diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 379e9f0738..75e95a9a3d 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1125,6 +1125,30 @@ modules in order until one establishes a connection within the
 corresponding timeout (see below) or all fail.</p>
 </item>
 
+<marker id="watchdog_config"/>
+<tag><c>{watchdog_config, [{okay|suspect, non_neg_integer()}]}</c></tag>
+<item>
+<p>
+Specifies configuration that alters the behaviour of the watchdog
+state machine.
+On key <c>okay</c>, the non-negative number of answered DWR
+messages required before transitioning from REOPEN to OKAY.
+On key <c>suspect</c>, the positive number of unanswered DWR messages
+before transitioning from OKAY to SUSPECT, or 0 to never make this
+transition.</p>
+
+<p>
+Defaults to <c>[{okay, 3}, {suspect, 1}]</c>.
+Not specifying a key is equivalent to specifying
+the default value for that key.</p>
+<warning>
+<p>
+The default value is as required by RFC 3539: changing it results
+in non-standard behaviour that should only be used to simulate
+misbehaving nodes during test.</p>
+</warning>
+</item>
+
 <marker id="watchdog_timer"/>
 <tag><c>{watchdog_timer, TwInit}</c></tag>
 <item>
-- 
cgit v1.2.3


From 924716b9bcecbda07ec630c705ede820363e92bc Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Mon, 4 Mar 2013 15:56:42 +0100
Subject: Tweak okay -> suspect config

Make it just a number of timeouts, without a new DWR being sent.
---
 lib/diameter/doc/src/diameter.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/diameter/doc')

diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 75e95a9a3d..8e9ec06ff9 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1132,10 +1132,10 @@ corresponding timeout (see below) or all fail.</p>
 Specifies configuration that alters the behaviour of the watchdog
 state machine.
 On key <c>okay</c>, the non-negative number of answered DWR
-messages required before transitioning from REOPEN to OKAY.
-On key <c>suspect</c>, the positive number of unanswered DWR messages
-before transitioning from OKAY to SUSPECT, or 0 to never make this
-transition.</p>
+messages before transitioning from REOPEN to OKAY.
+On key <c>suspect</c>, the number of watchdog timeouts before
+transitioning from OKAY to SUSPECT when DWR is unanswered, or 0 to
+not make the transition.</p>
 
 <p>
 Defaults to <c>[{okay, 3}, {suspect, 1}]</c>.
-- 
cgit v1.2.3


From e173bc1b28453f0edb4863677f3c730b3d7a9f91 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 18 Mar 2013 14:21:06 +0100
Subject: Prepare release

---
 lib/diameter/doc/src/notes.xml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'lib/diameter/doc')

diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index d63e2021c8..2daf84b0d4 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -42,6 +42,43 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>Diameter 1.4.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix broken Vendor-Specific-Application-Id configuration.</p>
+          <p>
+	    RFC 6733 changed the definition of this Grouped AVP,
+	    changing the arity of Vendor-Id from 1* to 1. A component
+	    Vendor-Id can now be either list- or integer-valued in
+	    service and transport configuration, allowing it to be
+	    used with both RFC 3588 and RFC 6733 dictionaries.</p>
+          <p>
+	    Own Id: OTP-10942</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add transport_opt() watchdog_config to allow non-standard
+	    behaviour of the watchdog state machine.</p>
+          <p>
+	    This can be useful during test but should not be used on
+	    nodes that must conform to RFC 3539.</p>
+          <p>
+	    Own Id: OTP-10898</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Diameter 1.4.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3