diff options
Diffstat (limited to 'lib/diameter')
| -rw-r--r-- | lib/diameter/doc/src/notes.xml | 30 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_service.erl | 4 | ||||
| -rw-r--r-- | lib/diameter/src/base/diameter_traffic.erl | 3 | ||||
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 13 | ||||
| -rw-r--r-- | lib/diameter/vsn.mk | 2 |
5 files changed, 46 insertions, 6 deletions
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> diff --git a/lib/diameter/src/base/diameter_service.erl b/lib/diameter/src/base/diameter_service.erl index 70e66537ed..67778b86f9 100644 --- a/lib/diameter/src/base/diameter_service.erl +++ b/lib/diameter/src/base/diameter_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2013. All Rights Reserved. +%% Copyright Ericsson AB 2010-2014. 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 @@ -1390,6 +1390,8 @@ pick_peer(Local, Remote, Pid, _SvcName, #diameter_app{mutable = true} = App) case call_service(Pid, {pick_peer, Local, Remote, App}) of {TPid, _} = T when is_pid(TPid) -> T; + false = No -> + No; {error, _} -> false end; 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) -> 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}]} ] }. 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) |