Skip to content
Browse files

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)
  • Loading branch information...
2 parents bbf3ab2 + c08c25a commit d93f6b263b4ff297caee66a0bca1c0513760bae1 Erlang/OTP committed Sep 13, 2010
Showing with 38 additions and 85 deletions.
  1. +37 −84 lib/megaco/src/app/megaco.appup.src
  2. +1 −1 lib/megaco/vsn.mk
View
121 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, []}
]
}
]
View
2 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)"

0 comments on commit d93f6b2

Please sign in to comment.
Something went wrong with that request. Please try again.