diff options
author | Erlang/OTP <[email protected]> | 2010-09-13 17:57:05 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-09-13 17:57:05 +0200 |
commit | d93f6b263b4ff297caee66a0bca1c0513760bae1 (patch) | |
tree | 15c97cf65191658d174647f314665f4d7874a325 /lib | |
parent | bbf3ab21b404aedbf9c7b7062b1e96062133fe44 (diff) | |
parent | c08c25abc6736ecd2518faaf6049c2ec12f4b1a0 (diff) | |
download | otp-d93f6b263b4ff297caee66a0bca1c0513760bae1.tar.gz otp-d93f6b263b4ff297caee66a0bca1c0513760bae1.tar.bz2 otp-d93f6b263b4ff297caee66a0bca1c0513760bae1.zip |
Merge branch 'bmk/megaco/prepare_for_r14b' of ../bjorn_otp into dev
* 'bmk/megaco/prepare_for_r14b' of ../bjorn_otp:
Prepare release of megaco-3.15 (R14B)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/megaco/src/app/megaco.appup.src | 121 | ||||
-rw-r--r-- | lib/megaco/vsn.mk | 2 |
2 files changed, 38 insertions, 85 deletions
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src index d904e8ab33..66068f650f 100644 --- a/lib/megaco/src/app/megaco.appup.src +++ b/lib/megaco/src/app/megaco.appup.src @@ -130,100 +130,53 @@ %% | %% v %% 3.14.1.1 +%% | +%% v +%% 3.15 %% %% {"%VSN%", [ - {"3.14.1", - [ - ] - }, - {"3.14", - [ - {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_config, soft, soft_purge, soft_purge, []} - ] - }, - {"3.13", - [ - {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_config, soft, soft_purge, soft_purge, []}, - {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_13_1}, - soft_purge, soft_purge, []} - ] - }, - {"3.12", - [ - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_udp, soft_purge, soft_purge, []}, - {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, - {update, megaco_config, soft, soft_purge, soft_purge, []}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_13_1}, - soft_purge, soft_purge, []} - ] - }, - {"3.11.3", + {"3.14.1.1", [ - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_udp, soft_purge, soft_purge, []}, - {load_module, megaco_messenger, soft_purge, soft_purge, - [megaco_config, megaco_monitor]}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_config, {advanced, upgrade_from_pre_3_12}, - soft_purge, soft_purge, []}, - {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_13_1}, - soft_purge, soft_purge, []} + {load_module, megaco_binary_transformer_prev3a, soft_purge, soft_purge, []}, + {load_module, megaco_binary_transformer_prev3b, soft_purge, soft_purge, []}, + {load_module, megaco_binary_transformer_prev3c, soft_purge, soft_purge, []}, + {load_module, megaco_sdp, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_v1, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_v1, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_v2, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_v2, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_prev3a, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_prev3a, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_prev3b, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_prev3b, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_prev3c, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_prev3c, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_v3, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_v3, soft_purge, soft_purge, []} ] } ], [ - {"3.14.1", - [ - ] - }, - {"3.14", - [ - {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_config, soft, soft_purge, soft_purge, []} - ] - }, - {"3.13", - [ - {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_config, soft, soft_purge, soft_purge, []}, - {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_13_1}, - soft_purge, soft_purge, []} - ] - }, - {"3.12", - [ - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_udp, soft_purge, soft_purge, []}, - {load_module, megaco_messenger, soft_purge, soft_purge, [megaco_monitor]}, - {update, megaco_config, soft, soft_purge, soft_purge, []}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_13_1}, - soft_purge, soft_purge, []} - ] - }, - {"3.11.3", + {"3.14.1.1", [ - {load_module, megaco_filter, soft_purge, soft_purge, []}, - {load_module, megaco_udp, soft_purge, soft_purge, []}, - {load_module, megaco_messenger, soft_purge, soft_purge, - [megaco_config, megaco_monitor]}, - {update, megaco_monitor, soft, soft_purge, soft_purge, []}, - {update, megaco_config, {advanced, downgrade_to_pre_3_12}, - soft_purge, soft_purge, []}, - {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_13_1}, - soft_purge, soft_purge, []} + {load_module, megaco_binary_transformer_prev3a, soft_purge, soft_purge, []}, + {load_module, megaco_binary_transformer_prev3b, soft_purge, soft_purge, []}, + {load_module, megaco_binary_transformer_prev3c, soft_purge, soft_purge, []}, + {load_module, megaco_sdp, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_v1, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_v1, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_v2, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_v2, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_prev3a, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_prev3a, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_prev3b, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_prev3b, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_prev3c, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_prev3c, soft_purge, soft_purge, []}, + {load_module, megaco_compact_text_encoder_v3, soft_purge, soft_purge, []}, + {load_module, megaco_pretty_text_encoder_v3, soft_purge, soft_purge, []} ] } ] diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk index 73ac5bbc63..9fc0e0f2fa 100644 --- a/lib/megaco/vsn.mk +++ b/lib/megaco/vsn.mk @@ -1,4 +1,4 @@ APPLICATION = megaco -MEGACO_VSN = 3.14.1.1 +MEGACO_VSN = 3.15 PRE_VSN = APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)" |