diff options
| author | Anders Svensson <[email protected]> | 2012-08-28 15:07:17 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-28 15:07:17 +0200 |
| commit | e3ba184dbd850ae43f43c9e4167120edc509a53e (patch) | |
| tree | f161731738a0c6383307f1610c8a71638426ce16 /lib/diameter/src/base/diameter.appup.src | |
| parent | f6b0856e2fed9266e81878a6f780f6db2b80c7df (diff) | |
| parent | ff76a60146dfa246efbfbed7f82de12df83bc862 (diff) | |
| download | otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.tar.gz otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.tar.bz2 otp-e3ba184dbd850ae43f43c9e4167120edc509a53e.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/diameter/src/base/diameter.appup.src')
| -rw-r--r-- | lib/diameter/src/base/diameter.appup.src | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src index 2ebdad598f..9b2a7d18ab 100644 --- a/lib/diameter/src/base/diameter.appup.src +++ b/lib/diameter/src/base/diameter.appup.src @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2011. All Rights Reserved. +%% Copyright Ericsson AB 2010-2012. 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 @@ -22,13 +22,28 @@ [ {"0.9", [{restart_application, diameter}]}, {"0.10", [{restart_application, diameter}]}, - {"1.0", [{update, diameter_service}, - {update, diameter_watchdog}]} + {"1.0", [{restart_application, diameter}]}, + {"1.1", [%% new code + {add_module, diameter_transport}, + %% modified code + {load, diameter_sctp}, + {load, diameter_stats}, + {load, diameter_service}, + {load, diameter_config}, + {load, diameter_codec}, + {load, diameter_watchdog}, + {load, diameter_peer}, + {load, diameter_peer_fsm}, + {load, diameter}, + %% unmodified but including modified diameter.hrl + {load, diameter_callback}, + {load, diameter_capx}, + {load, diameter_types}]} ], [ {"0.9", [{restart_application, diameter}]}, {"0.10", [{restart_application, diameter}]}, - {"1.0", [{update, diameter_watchdog}, - {update, diameter_service}]} + {"1.0", [{restart_application, diameter}]}, + {"1.1", [{restart_application, diameter}]} ] }. |