Merge branch 'anders/diameter/19.0-rc1/OTP-12913'

* anders/diameter/19.0-rc1/OTP-12913:
  vsn -> 1.12
  Update appup for 19.0-rc1
  Update documentation for CEA/DWA/DPA Result-Code counters

3 files changed, 21 insertions, 13 deletions

diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml
index 66daf6bb0b..d68a78ed6d 100644
--- a/lib/diameter/doc/src/diameter.xml
+++ b/lib/diameter/doc/src/diameter.xml
@@ -1764,11 +1764,13 @@ An example return value with for a client service with Origin-Host
                       {send_pend,0}]}]},
   {statistics,[{{{0,258,0},recv},3},
                {{{0,258,1},send},3},
+               {{{0,258,0},recv,{'Result-Code',2001}},3},
                {{{0,257,0},recv},1},
                {{{0,257,1},send},1},
-               {{{0,258,0},recv,{'Result-Code',2001}},3},
+               {{{0,257,0},recv,{'Result-Code',2001}},1},
                {{{0,280,1},recv},2},
-               {{{0,280,0},send},2}]}]]
+               {{{0,280,0},send},2},
+               {{{0,280,0},send,{'Result-Code',2001}},2}]}]]
 </pre>
 
 <p>
@@ -1844,13 +1846,16 @@ connection might look as follows.</p>
            [{watchdog,{&lt;0.72.0>,{1346,171491,998404},initial}}]]},
   {statistics,[{{{0,280,0},recv},7},
                {{{0,280,1},send},7},
-               {{{0,258,0},send,{'Result-Code',2001}},3},
+               {{{0,280,0},recv,{'Result-Code',2001}},7},
                {{{0,258,1},recv},3},
                {{{0,258,0},send},3},
+               {{{0,258,0},send,{'Result-Code',2001}},3},
                {{{0,280,1},recv},5},
                {{{0,280,0},send},5},
+               {{{0,280,0},send,{'Result-Code',2001}},5},
                {{{0,257,1},recv},1},
-               {{{0,257,0},send},1}]}]]
+               {{{0,257,0},send},1},
+               {{{0,257,0},send,{'Result-Code',2001}},1}]}]]
 </pre>
 
 <p>
@@ -1918,13 +1923,16 @@ A return value for the server above might look as follows.</p>
                       {send_pend,0}]}]},
   {statistics,[{{{0,280,0},recv},62},
                {{{0,280,1},send},62},
-               {{{0,258,0},send,{'Result-Code',2001}},3},
+               {{{0,280,0},recv,{'Result-Code',2001}},62},
                {{{0,258,1},recv},3},
                {{{0,258,0},send},3},
+               {{{0,258,0},send,{'Result-Code',2001}},3},
                {{{0,280,1},recv},66},
                {{{0,280,0},send},66},
+               {{{0,280,0},send,{'Result-Code',2001}},66},
                {{{0,257,1},recv},1},
-               {{{0,257,0},send},1}]}]]
+               {{{0,257,0},send},1},
+               {{{0,257,0},send,{'Result-Code',2001}},1}]}]]
 </pre>
 
 <p>
diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 12b09889d1..618d5a7f10 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -47,10 +47,9 @@
   {"1.9.2.2", [{restart_application, diameter}]},  %% 17.5.6.7
   {"1.9.2.3", [{restart_application, diameter}]},  %% 17.5.6.8
   {"1.10",    [{restart_application, diameter}]},  %% 18.0
-  {"1.11",    [{load_module, diameter_traffic},    %% 18.1
-               {update, diameter_service, {advanced, []}}]},
-  {"1.11.1",  [{load_module, diameter_traffic},    %% 18.2
-               {update, diameter_service, {advanced, []}}]}
+  {"1.11",    [{restart_application, diameter}]},  %% 18.1
+  {"1.11.1",  [{restart_application, diameter}]},  %% 18.2
+  {"1.11.2",  [{restart_application, diameter}]}   %% 18.3
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -80,6 +79,7 @@
   {"1.9.2.3", [{restart_application, diameter}]},
   {"1.10",    [{restart_application, diameter}]},
   {"1.11",    [{restart_application, diameter}]},
-  {"1.11.1",  [{restart_application, diameter}]}
+  {"1.11.1",  [{restart_application, diameter}]},
+  {"1.11.2",  [{restart_application, diameter}]}
  ]
 }.
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 836def8447..cb750c69a3 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -1,6 +1,6 @@
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2015. All Rights Reserved.
+# Copyright Ericsson AB 2010-2016. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.11.2
+DIAMETER_VSN = 1.12
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)