diff options
| author | Erlang/OTP <[email protected]> | 2012-11-05 17:27:18 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-11-05 17:27:18 +0100 |
| commit | 210d354d305a9672b4725dfe7b98bdbbdb18cf85 (patch) | |
| tree | 01593928c3c6e13ea86f22a75e26ff9445142880 /lib/diameter/src/base/diameter.appup.src | |
| parent | d2258a88c708762083572faaaaf3ea3304526f56 (diff) | |
| parent | eaa782f30b3b281a9c652e17ba8c1730f99e957d (diff) | |
| download | otp-210d354d305a9672b4725dfe7b98bdbbdb18cf85.tar.gz otp-210d354d305a9672b4725dfe7b98bdbbdb18cf85.tar.bz2 otp-210d354d305a9672b4725dfe7b98bdbbdb18cf85.zip | |
Merge branch 'anders/diameter/patch/R15B02/OTP-10555' into maint-r15
* anders/diameter/patch/R15B02/OTP-10555:
vsn -> 1.2.1
Update appup for OTP-10461/10550
Allow for no diameter on remote node in connection guard
Add missing clause for peer failover
Diffstat (limited to 'lib/diameter/src/base/diameter.appup.src')
| -rw-r--r-- | lib/diameter/src/base/diameter.appup.src | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter.appup.src b/lib/diameter/src/base/diameter.appup.src index 9b2a7d18ab..4de87c1023 100644 --- a/lib/diameter/src/base/diameter.appup.src +++ b/lib/diameter/src/base/diameter.appup.src @@ -38,12 +38,16 @@ %% unmodified but including modified diameter.hrl {load, diameter_callback}, {load, diameter_capx}, - {load, diameter_types}]} + {load, diameter_types}]}, + {"1.2", [{load, diameter_codec}, + {load, diameter_peer_fsm}]} ], [ {"0.9", [{restart_application, diameter}]}, {"0.10", [{restart_application, diameter}]}, {"1.0", [{restart_application, diameter}]}, - {"1.1", [{restart_application, diameter}]} + {"1.1", [{restart_application, diameter}]}, + {"1.2", [{load, diameter_codec}, + {load, diameter_peer_fsm}]} ] }. |