From 60a406953743500a08cc3efcc0d2c25497d7e58b Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Mon, 26 May 2014 15:21:41 +0200
Subject: Fix broken release note for diameter-1.4.4

Those were bug fixes, not known issues.
---
 lib/diameter/doc/src/notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 675ffcfd18..68e69dbfeb 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -238,7 +238,7 @@ first.</p>
 
 <section><title>diameter 1.4.4</title>
 
-    <section><title>Known Bugs and Problems</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
       <list>
         <item>
           <p>
-- 
cgit v1.2.3


From 3972070898ee40e17ea44953a13af566122505f3 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 21 May 2014 19:30:48 +0200
Subject: vsn -> 1.7

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

(limited to 'lib/diameter')

diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 54019fa46c..560c2aed50 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -18,5 +18,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.6
+DIAMETER_VSN = 1.7
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
-- 
cgit v1.2.3


From 14f9851eb6bb4330f50517d74cc07dce71005141 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 21 May 2014 10:58:59 +0200
Subject: Update appup for OTP-11891: result code counters for CEA/DWA/DPA

Modules: diameter_traffic, diameter_peer_fsm, diameter_watchdog

diameter_traffic must be loaded first.
---
 lib/diameter/src/diameter.appup.src | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 0d421c229e..7493175510 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -34,7 +34,10 @@
   {"1.4.2",   [{restart_application, diameter}]},  %% R16B01
   {"1.4.3",   [{restart_application, diameter}]},  %% R16B02
   {"1.4.4",   [{restart_application, diameter}]},
-  {"1.5",     [{restart_application, diameter}]}   %% R16B03
+  {"1.5",     [{restart_application, diameter}]},  %% R16B03
+  {"1.6",     [{load_module, diameter_traffic},    %% 17.0
+               {load_module, diameter_peer_fsm},
+               {load_module, diameter_watchdog}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -51,6 +54,9 @@
   {"1.4.2",   [{restart_application, diameter}]},
   {"1.4.3",   [{restart_application, diameter}]},
   {"1.4.4",   [{restart_application, diameter}]},
-  {"1.5",     [{restart_application, diameter}]}
+  {"1.5",     [{restart_application, diameter}]},
+  {"1.6",     [{load_module, diameter_watchdog},
+               {load_module, diameter_peer_fsm},
+               {load_module, diameter_traffic}]}
  ]
 }.
-- 
cgit v1.2.3


From 478db2caade23eaa321a1cd0472ccd3377c33989 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 21 May 2014 11:01:06 +0200
Subject: Update appup for OTP-11893: request table leak

Modules: diameter_service
---
 lib/diameter/src/diameter.appup.src | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 7493175510..206668dbd6 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -37,7 +37,8 @@
   {"1.5",     [{restart_application, diameter}]},  %% R16B03
   {"1.6",     [{load_module, diameter_traffic},    %% 17.0
                {load_module, diameter_peer_fsm},
-               {load_module, diameter_watchdog}]}
+               {load_module, diameter_watchdog},
+               {load_module, diameter_service}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -55,7 +56,8 @@
   {"1.4.3",   [{restart_application, diameter}]},
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},
-  {"1.6",     [{load_module, diameter_watchdog},
+  {"1.6",     [{load_module, diameter_service},
+               {load_module, diameter_watchdog},
                {load_module, diameter_peer_fsm},
                {load_module, diameter_traffic}]}
  ]
-- 
cgit v1.2.3


From c8219be8e362639704aecbb212722934add95598 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Wed, 21 May 2014 19:28:34 +0200
Subject: Update appup for OTP-11901: diameter_sctp function_clause

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

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 206668dbd6..4e73612c8b 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -38,7 +38,8 @@
   {"1.6",     [{load_module, diameter_traffic},    %% 17.0
                {load_module, diameter_peer_fsm},
                {load_module, diameter_watchdog},
-               {load_module, diameter_service}]}
+               {load_module, diameter_service},
+               {load_module, diameter_sctp}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -56,7 +57,8 @@
   {"1.4.3",   [{restart_application, diameter}]},
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},
-  {"1.6",     [{load_module, diameter_service},
+  {"1.6",     [{load_module, diameter_sctp},
+               {load_module, diameter_service},
                {load_module, diameter_watchdog},
                {load_module, diameter_peer_fsm},
                {load_module, diameter_traffic}]}
-- 
cgit v1.2.3


From 6e62633ab30ffd7c1514e30f4ea61bc33eb979a4 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 22 May 2014 23:36:12 +0200
Subject: Update appup for OTP-11937: counters

Modules: diameter_peer_fsm, diameter_watchdog, diameter_codec,
         diameter_traffic

diameter_traffic must be loaded first.
---
 lib/diameter/src/diameter.appup.src | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 4e73612c8b..ffbf4536c2 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -36,6 +36,7 @@
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},  %% R16B03
   {"1.6",     [{load_module, diameter_traffic},    %% 17.0
+               {load_module, diameter_codec},
                {load_module, diameter_peer_fsm},
                {load_module, diameter_watchdog},
                {load_module, diameter_service},
@@ -61,6 +62,7 @@
                {load_module, diameter_service},
                {load_module, diameter_watchdog},
                {load_module, diameter_peer_fsm},
+               {load_module, diameter_codec},
                {load_module, diameter_traffic}]}
  ]
 }.
-- 
cgit v1.2.3


From 1e036cbc0534e16390ca0c2ac5f9eb98653e4710 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 22 May 2014 23:39:55 +0200
Subject: Update appup for OTP-11721: log and counter hardening

Modules: diameter_codec, diameter_peer_fsm, diameter_watchdog,
         diameter_traffic, diameter_service, diameter_lib,
         dictionary modules

diameter_lib and diameter_traffic (in that order) must be loaded first.
diameter_codec last must be loaded before diameter_peer_fsm and
diameter_watchdog.
---
 lib/diameter/src/diameter.appup.src | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index ffbf4536c2..86bd1cd77a 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -35,11 +35,17 @@
   {"1.4.3",   [{restart_application, diameter}]},  %% R16B02
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},  %% R16B03
-  {"1.6",     [{load_module, diameter_traffic},    %% 17.0
-               {load_module, diameter_codec},
+  {"1.6",     [{load_module, diameter_lib},        %% 17.0
+               {load_module, diameter_traffic},
                {load_module, diameter_peer_fsm},
                {load_module, diameter_watchdog},
                {load_module, diameter_service},
+               {load_module, diameter_gen_base_rfc6733},
+               {load_module, diameter_gen_acct_rfc6733},
+               {load_module, diameter_gen_base_rfc3588},
+               {load_module, diameter_gen_accounting},
+               {load_module, diameter_gen_relay},
+               {load_module, diameter_codec},
                {load_module, diameter_sctp}]}
  ],
  [
@@ -59,10 +65,16 @@
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},
   {"1.6",     [{load_module, diameter_sctp},
+               {load_module, diameter_codec},
+               {load_module, diameter_gen_relay},
+               {load_module, diameter_gen_accounting},
+               {load_module, diameter_gen_base_rfc3588},
+               {load_module, diameter_gen_acct_rfc6733},
+               {load_module, diameter_gen_base_rfc6733},
                {load_module, diameter_service},
                {load_module, diameter_watchdog},
                {load_module, diameter_peer_fsm},
-               {load_module, diameter_codec},
-               {load_module, diameter_traffic}]}
+               {load_module, diameter_traffic},
+               {load_module, diameter_lib}]}
  ]
 }.
-- 
cgit v1.2.3


From fff6ec7df7fb3d022fc95ba9454182a8f135aad5 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 22 May 2014 23:43:34 +0200
Subject: Update appup for OTP-11938: terminate watchdog after DPR reception

Modules: diameter_watchdog, diameter_peer_fsm

diameter_watchdog must be loaded first.
---
 lib/diameter/src/diameter.appup.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/diameter')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 86bd1cd77a..b7b9662383 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -37,8 +37,8 @@
   {"1.5",     [{restart_application, diameter}]},  %% R16B03
   {"1.6",     [{load_module, diameter_lib},        %% 17.0
                {load_module, diameter_traffic},
-               {load_module, diameter_peer_fsm},
                {load_module, diameter_watchdog},
+               {load_module, diameter_peer_fsm},
                {load_module, diameter_service},
                {load_module, diameter_gen_base_rfc6733},
                {load_module, diameter_gen_acct_rfc6733},
@@ -72,8 +72,8 @@
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc6733},
                {load_module, diameter_service},
-               {load_module, diameter_watchdog},
                {load_module, diameter_peer_fsm},
+               {load_module, diameter_watchdog},
                {load_module, diameter_traffic},
                {load_module, diameter_lib}]}
  ]
-- 
cgit v1.2.3