diff options
| author | Anders Svensson <[email protected]> | 2012-11-19 15:47:39 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2012-11-19 15:47:39 +0100 |
| commit | 1ecc870573b37491e9dd7965d29d20efea557c01 (patch) | |
| tree | b78d75446981e43bf62e662fd79abc077a0616ca /lib/diameter/src/base/diameter.appup.src | |
| parent | 608ae226acd4c6340c66ce6038436f849b735673 (diff) | |
| parent | 42a9dfb10de174c13a204e035992720a02c9751f (diff) | |
| download | otp-1ecc870573b37491e9dd7965d29d20efea557c01.tar.gz otp-1ecc870573b37491e9dd7965d29d20efea557c01.tar.bz2 otp-1ecc870573b37491e9dd7965d29d20efea557c01.zip | |
Merge branch 'anders/diameter/R15B03_release/OTP-10582' into maint
* anders/diameter/R15B03_release/OTP-10582:
vsn -> 1.3
Update appup for R15B03
Dialyzer fix
Insert missing 1.1 release notes
Minor test suite tweaks
vsn -> 1.2.1
Update appup for OTP-10461/10550
Diffstat (limited to 'lib/diameter/src/base/diameter.appup.src')
| -rw-r--r-- | lib/diameter/src/base/diameter.appup.src | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src index 9b2a7d18ab..5655f98c1b 100644 --- a/lib/diameter/src/base/diameter.appup.src +++ b/lib/diameter/src/base/diameter.appup.src @@ -20,30 +20,38 @@ {"%VSN%", [ - {"0.9", [{restart_application, diameter}]}, - {"0.10", [{restart_application, diameter}]}, - {"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", [{restart_application, diameter}]}, + {"1.1", [{restart_application, diameter}]}, + {"1.2", [{load, diameter}, + {load, diameter_capx}, + {load, diameter_codec}, + {load, diameter_peer}, + {load, diameter_reg}, + %% order significant from here + {load, diameter_session}, + {load, diameter_peer_fsm}, + {load, diameter_service}, + {load, diameter_watchdog}, + {load, diameter_config}]}, + {"1.2.1", [{load, diameter}, + {load, diameter_capx}, + {load, diameter_peer}, + {load, diameter_reg}, + %% order significant from here + {load, diameter_session}, + {load, diameter_peer_fsm}, + {load, diameter_service}, + {load, diameter_watchdog}, + {load, diameter_config}]} ], [ - {"0.9", [{restart_application, diameter}]}, - {"0.10", [{restart_application, diameter}]}, - {"1.0", [{restart_application, diameter}]}, - {"1.1", [{restart_application, diameter}]} + {"0.9", [{restart_application, diameter}]}, + {"0.10", [{restart_application, diameter}]}, + {"1.0", [{restart_application, diameter}]}, + {"1.1", [{restart_application, diameter}]}, + {"1.2", [{restart_application, diameter}]}, + {"1.2.1", [{restart_application, diameter}]} ] }. |