diff options
| author | Erlang/OTP <[email protected]> | 2015-05-29 12:40:18 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-05-29 12:40:18 +0200 |
| commit | 6c179d9c4184ca44e6bff649642f710125906977 (patch) | |
| tree | f26113b2c9ddf74f77e011144b5dced14f5b9118 | |
| parent | 35ca4282c5bd8a91f80397d0b5c53b661811a374 (diff) | |
| parent | badba473f06792849bd1c227be0b1400885f9960 (diff) | |
| download | otp-6c179d9c4184ca44e6bff649642f710125906977.tar.gz otp-6c179d9c4184ca44e6bff649642f710125906977.tar.bz2 otp-6c179d9c4184ca44e6bff649642f710125906977.zip | |
Merge branch 'anders/diameter/17.5.5/OTP-12757' into maint-17
* anders/diameter/17.5.5/OTP-12757:
vsn -> 1.9.2
Update appup for 17.5.5
Fix mangled release note
| -rw-r--r-- | lib/diameter/doc/src/notes.xml | 2 | ||||
| -rw-r--r-- | lib/diameter/src/diameter.appup.src | 10 | ||||
| -rw-r--r-- | lib/diameter/vsn.mk | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml index 6931788c83..51f905682d 100644 --- a/lib/diameter/doc/src/notes.xml +++ b/lib/diameter/doc/src/notes.xml @@ -65,7 +65,7 @@ first.</p> received in an answer not setting the E-bit. The correct AVP is now extracted from the incoming message.</p> <p> - Own Id: OTP-12654 Aux Id: seq12851 </p> + Own Id: OTP-12654</p> </item> <item> <p> diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src index 0ef0fd35a9..b89859ed24 100644 --- a/lib/diameter/src/diameter.appup.src +++ b/lib/diameter/src/diameter.appup.src @@ -65,11 +65,14 @@ {update, diameter_sup, supervisor}]}, {"1.9", [{load_module, diameter_codec}, %% 17.5 {load_module, diameter_traffic}, + {load_module, diameter_sctp}, {load_module, diameter_gen_base_rfc6733}, {load_module, diameter_gen_acct_rfc6733}, {load_module, diameter_gen_base_rfc3588}, {load_module, diameter_gen_base_accounting}, - {load_module, diameter_gen_relay}]} + {load_module, diameter_gen_relay}]}, + {"1.9.1", [{load_module, diameter_traffic}, %% 17.5.3 + {load_module, diameter_sctp}]} ], [ {"0.9", [{restart_application, diameter}]}, @@ -120,7 +123,10 @@ {load_module, diameter_gen_base_rfc3588}, {load_module, diameter_gen_acct_rfc6733}, {load_module, diameter_gen_base_rfc6733}, + {load_module, diameter_sctp}, {load_module, diameter_traffic}, - {load_module, diameter_codec}]} + {load_module, diameter_codec}]}, + {"1.9.1", [{load_module, diameter_sctp}, + {load_module, diameter_traffic}]} ] }. diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index db7f72c44e..c278e74dca 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -16,5 +16,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 1.9.1 +DIAMETER_VSN = 1.9.2 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |