From d436ca385b6883824b768fe6b806341c86db0409 Mon Sep 17 00:00:00 2001 From: Anders Svensson Date: Thu, 5 Mar 2015 08:04:58 +0100 Subject: Minor doc fix --- lib/diameter/doc/src/diameter.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/diameter/doc/src/diameter.xml b/lib/diameter/doc/src/diameter.xml index bb281bc0dc..37e67d8630 100644 --- a/lib/diameter/doc/src/diameter.xml +++ b/lib/diameter/doc/src/diameter.xml @@ -674,7 +674,7 @@ connection establishment.

{'CEA', Result, Caps, Pkt} 
-Result = integer() | atom() | {capabilities_cb, CB, ResultCode|discard}
+Result = ResultCode | atom() | {capabilities_cb, CB, ResultCode|discard}
 Caps = #diameter_caps{}
 Pkt  = #diameter_packet{}
 ResultCode = integer()
-- 
cgit v1.2.3


From c58fe14c690a3a9bb0ef3d371d341397c91a979d Mon Sep 17 00:00:00 2001
From: Anders Svensson 
Date: Thu, 29 Jan 2015 00:29:42 +0100
Subject: Update appup for 17.5

Required load order by ticket.

- OTP-11492, answer messages discarded
- OTP-12415, retransmission failure
- OTP-12475, grouped AVP decode
- OTP-12543, no requests after DPR

    none

- OTP-12412, shutdown issues

    diameter_lib
    diameter_service

- OTP-12428, transport_opt() pool_size

    diameter_lib
    diameter_service
    diameter, diameter_config

    diameter_{tcp,sctp}
    diameter, diameter_config

- OTP-12439, new time api in Erlang/OTP 18

    diameter_lib
    diameter_{config,peer,reg,service,session,stats,sync,watchdog,sctp}

- OTP-11952, service_opt() decode_string
- OTP-12589, DiameterURI encode/decode

    diameter_{capx,codec,peer}
    diameter_types
    diameter_traffic
    diameter_{service,peer_fsm}
    diameter_watchdog
    diameter, diameter_config

- OTP-12542, DPR with diameter:call/4

    diameter_{peer_fsm,watchdog}
    diameter, diameter_config

- OTP-12609, transport_opt() dpr_timeout

    diameter_peer_fsm
    diameter, diameter_config
---
 lib/diameter/src/diameter.appup.src | 56 +++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index 881d25b5fb..a54eb24031 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2014. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2015. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -59,7 +59,32 @@
   {"1.7.1",   [{load_module, diameter_traffic},    %% 17.3
                {load_module, diameter_watchdog},
                {load_module, diameter_peer_fsm},
-               {load_module, diameter_service}]}
+               {load_module, diameter_service}]},
+  {"1.8",     [{load_module, diameter_lib},        %% 17.4
+               {load_module, diameter_peer},
+               {load_module, diameter_reg},
+               {load_module, diameter_session},
+               {load_module, diameter_stats},
+               {load_module, diameter_sync},
+               {load_module, diameter_capx},
+               {load_module, diameter_codec},
+               {load_module, diameter_types},
+               {load_module, diameter_traffic},
+               {load_module, diameter_service},
+               {load_module, diameter_peer_fsm},
+               {load_module, diameter_watchdog},
+               {load_module, diameter_tcp},
+               {load_module, diameter_sctp},
+               {load_module, diameter_config},
+               {load_module, diameter},
+               {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},
+               {update, diameter_transport_sup, supervisor},
+               {update, diameter_service_sup, supervisor},
+               {update, diameter_sup, supervisor}]}
  ],
  [
   {"0.9",     [{restart_application, diameter}]},
@@ -101,6 +126,31 @@
   {"1.7.1",   [{load_module, diameter_service},
                {load_module, diameter_peer_fsm},
                {load_module, diameter_watchdog},
-               {load_module, diameter_traffic}]}
+               {load_module, diameter_traffic}]},
+  {"1.8",     [{update, diameter_sup, supervisor},
+               {update, diameter_service_sup, supervisor},
+               {update, diameter_transport_sup, supervisor},
+               {load_module, diameter_gen_relay},
+               {load_module, diameter_gen_base_accounting},
+               {load_module, diameter_gen_base_rfc3588},
+               {load_module, diameter_gen_acct_rfc6733},
+               {load_module, diameter_gen_base_rfc6733},
+               {load_module, diameter},
+               {load_module, diameter_config},
+               {load_module, diameter_sctp},
+               {load_module, diameter_tcp},
+               {load_module, diameter_watchdog},
+               {load_module, diameter_peer_fsm},
+               {load_module, diameter_service},
+               {load_module, diameter_traffic},
+               {load_module, diameter_types},
+               {load_module, diameter_codec},
+               {load_module, diameter_capx},
+               {load_module, diameter_sync},
+               {load_module, diameter_stats},
+               {load_module, diameter_session},
+               {load_module, diameter_reg},
+               {load_module, diameter_peer},
+               {load_module, diameter_lib}]}
  ]
 }.
-- 
cgit v1.2.3


From 6e6929bec4d1aedece23bf55b7f73d9f5ba187e4 Mon Sep 17 00:00:00 2001
From: Anders Svensson 
Date: Mon, 23 Feb 2015 01:27:28 +0100
Subject: vsn -> 1.9

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

diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index 587ae08b3d..c00bac26bb 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -1,8 +1,6 @@
-#-*-makefile-*-   ; force emacs to enter makefile-mode
-
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2010-2014. All Rights Reserved.
+# Copyright Ericsson AB 2010-2015. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,5 +16,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 1.8
+DIAMETER_VSN = 1.9
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
-- 
cgit v1.2.3