diff options
| author | Anders Svensson <[email protected]> | 2012-08-28 15:04:56 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-08-28 15:04:56 +0200 |
| commit | d4eccdc4b544215f3706408bdeabe8c231780065 (patch) | |
| tree | c34a275caf2b8be79ae25d18d0d98079293ce33e /lib/diameter/src/base/diameter.appup.src | |
| parent | 2fb7f9750ee0d7f33d91f6e12c4339a7a64fb481 (diff) | |
| parent | fef602372214f864ab1d685ee6053d36d9dcc605 (diff) | |
| download | otp-d4eccdc4b544215f3706408bdeabe8c231780065.tar.gz otp-d4eccdc4b544215f3706408bdeabe8c231780065.tar.bz2 otp-d4eccdc4b544215f3706408bdeabe8c231780065.zip | |
Merge branch 'anders/diameter/R15B02_release' into maint
* anders/diameter/R15B02_release:
Update appup
Add plt/dialyze targets to src/Makefile
Add realclean target to src/Makefile
Add any target to test/Makefile
vsn -> 1.2
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}]} ] }. |