From 94c2057beb02608d24cd93432fba72f9a427a20b Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 9 Dec 2015 14:27:19 +0100
Subject: Update appup for diameter 1.5.1

---
 lib/diameter/src/diameter.appup.src | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index c7ae8a2828..30c923a869 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -36,11 +36,13 @@
              {load_module, diameter_config},
              {load_module, diameter_capx},
              {load_module, diameter_service},
+             {load_module, diameter_traffic},
              {load_module, diameter_peer_fsm},
              {load_module, diameter_watchdog},
              {load_module, diameter}]},
   {"1.4.3", [{load_module, diameter_capx},       %% R16B02
              {load_module, diameter_service},
+             {load_module, diameter_traffic},
              {load_module, diameter_watchdog},
              {load_module, diameter_codec},
              {load_module, diameter_types},
@@ -48,9 +50,12 @@
              {load_module, diameter}]},
   {"1.4.4", [{load_module, diameter_capx},
              {load_module, diameter_service},
+             {load_module, diameter_traffic},
              {load_module, diameter_watchdog},
              {load_module, diameter_config},
-             {load_module, diameter}]}
+             {load_module, diameter}]},
+  {"1.5",   [{load_module, diameter_service},    %% R16B03
+             {load_module, diameter_traffic}]}
  ],
  [
   {"0.9",   [{restart_application, diameter}]},
@@ -68,14 +73,18 @@
   {"1.4.3", [{load_module, diameter_types},
              {load_module, diameter_config},
              {load_module, diameter_codec},
+             {load_module, diameter_traffic},
              {load_module, diameter_service},
              {load_module, diameter_watchdog},
              {load_module, diameter_capx},
              {load_module, diameter}]},
   {"1.4.4", [{load_module, diameter_capx},
              {load_module, diameter_config},
+             {load_module, diameter_traffic},
              {load_module, diameter_service},
              {load_module, diameter_watchdog},
-             {load_module, diameter}]}
+             {load_module, diameter}]},
+  {"1.5",   [{load_module, diameter_traffic},
+             {load_module, diameter_service}]}
  ]
 }.
-- 
cgit v1.2.3


From d25d0787413eb403bc11e770dbf17416bd251b08 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 9 Dec 2015 14:27:50 +0100
Subject: vsn -> 1.5.1

---
 lib/diameter/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 9fda067f2b..8ca8dc4b45 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.5
+DIAMETER_VSN = 1.5.1
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
-- 
cgit v1.2.3


From 6121107d63ef65b6b96c99684181578db2eea3aa Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 9 Dec 2015 11:23:04 +0100
Subject: Remove logging of faulty answer messages

Since excessive numbers of them can overload a node with logging.

Note that most log messages have been removed in OTP 17.1, and replaced
by counters. In particular, logging as a result of incoming traffic,
over which we have no control, is dangerous.
---
 lib/diameter/src/base/diameter_traffic.erl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index 8b6f026b34..54b0daf7f9 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1072,8 +1072,7 @@ int(_) ->
 -spec x(any(), atom(), list()) -> no_return().
 
 %% Warn and exit request process on errors in an incoming answer.
-x(Reason, F, A) ->
-    diameter_lib:warning_report(Reason, {?MODULE, F, A}),
+x(Reason, _F, _A) ->
     x(Reason).
 
 x(T) ->
-- 
cgit v1.2.3


From 0f6b72141b7e04699aae3394b2b29191c8acdec5 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 9 Dec 2015 14:44:41 +0100
Subject: Update release notes

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

diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 18c712ec3d..059fffff23 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -42,6 +42,36 @@ first.</p>
 
 <!-- ===================================================================== -->
 
+<section><title>diameter 1.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix pick_peer case clause failure.</p>
+          <p>
+	    In the case of {call_mutates_state, true} configuration
+	    on the service in question, any peer selection that
+	    failed to select a peer resulted in a case clause
+	    failure. This was noticed in the case of a peer failover
+	    in which an alternate peer wasn't available.</p>
+          <p>
+	    Own Id: OTP-11789</p>
+        </item>
+        <item>
+          <p>
+	    Remove logging of faulty answer messages.</p>
+          <p>
+	    Since excessive numbers of them can overload a node with
+	    logging.</p>
+          <p>
+	    Own Id: OTP-13182</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 1.5</title>
 
     <section><title>Improvements and New Features</title>
-- 
cgit v1.2.3