From fda0d3c3c95b640605abde573fdd534a63095e47 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sat, 23 May 2015 08:15:52 +0200
Subject: Fix mangled release note

---
 lib/diameter/doc/src/notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 6931788c83..51f905682d 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -65,7 +65,7 @@ first.</p>
 	    received in an answer not setting the E-bit. The correct
 	    AVP is now extracted from the incoming message.</p>
           <p>
-	    Own Id: OTP-12654 Aux Id: seq12851 </p>
+	    Own Id: OTP-12654</p>
         </item>
         <item>
           <p>
-- 
cgit v1.2.3


From a18cae674bc6a629af2c6531b315b2cc18c51c82 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 21 May 2015 00:05:07 +0200
Subject: Update appup for 17.5.5

- OTP-12741: disfunctional counters
- OTP-12744: diameter_sctp race

No load order requirements.
---
 lib/diameter/src/diameter.appup.src | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 0ef0fd35a9..b89859ed24 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -65,11 +65,14 @@
                {update, diameter_sup, supervisor}]},
   {"1.9",     [{load_module, diameter_codec},      %% 17.5
                {load_module, diameter_traffic},
+               {load_module, diameter_sctp},
                {load_module, diameter_gen_base_rfc6733},
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc3588},
                {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_relay}]}
+               {load_module, diameter_gen_relay}]},
+  {"1.9.1",   [{load_module, diameter_traffic},    %% 17.5.3
+               {load_module, diameter_sctp}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -120,7 +123,10 @@
                {load_module, diameter_gen_base_rfc3588},
                {load_module, diameter_gen_acct_rfc6733},
                {load_module, diameter_gen_base_rfc6733},
+               {load_module, diameter_sctp},
                {load_module, diameter_traffic},
-               {load_module, diameter_codec}]}
+               {load_module, diameter_codec}]},
+  {"1.9.1",   [{load_module, diameter_sctp},
+               {load_module, diameter_traffic}]}
  ]
 }.
-- 
cgit v1.2.3


From badba473f06792849bd1c227be0b1400885f9960 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 21 May 2015 00:07:19 +0200
Subject: vsn -> 1.9.2

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

(limited to 'lib')

diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index db7f72c44e..c278e74dca 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -16,5 +16,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.9.1
+DIAMETER_VSN = 1.9.2
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
-- 
cgit v1.2.3