aboutsummaryrefslogtreecommitdiffstats
path: root/lib/megaco/src/app
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-04-16 15:45:16 +0200
committerMicael Karlberg <[email protected]>2013-04-16 15:45:16 +0200
commit579b659afdc9dd5a2178c5c756964ba3b56dbded (patch)
treeff8234ef6824f2a4fa0884d9b40de8b30478ef56 /lib/megaco/src/app
parentc9a6ea38eb2a2a3c3d91e3905ce561fd001320be (diff)
parent592f8635f6496fcd082828a1c7769df5c21fae33 (diff)
downloadotp-579b659afdc9dd5a2178c5c756964ba3b56dbded.tar.gz
otp-579b659afdc9dd5a2178c5c756964ba3b56dbded.tar.bz2
otp-579b659afdc9dd5a2178c5c756964ba3b56dbded.zip
Merge branch 'bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r13' into bmk/megaco/flex_buffer_overrun_while_scanning_prop_parms/OTP-10998/r14
Conflicts: lib/megaco/doc/src/notes.xml lib/megaco/src/app/megaco.appup.src lib/megaco/test/megaco_codec_flex_lib.erl lib/megaco/test/megaco_codec_v2_test.erl lib/megaco/test/megaco_test_lib.erl lib/megaco/vsn.mk
Diffstat (limited to 'lib/megaco/src/app')
-rw-r--r--lib/megaco/src/app/megaco.appup.src268
1 files changed, 147 insertions, 121 deletions
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 7107178d1a..66d144373c 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -19,132 +19,146 @@
%%
%%
-%% 3.4.3
-%% |
-%% v
-%% 3.4.4
-%% / \
-%% | |
-%% v v
-%% 3.5 3.4.5
-%% | |
-%% v v
-%% 3.5.1 <- 3.4.6
-%% |
-%% v
-%% 3.5.2
-%% |
-%% v
-%% 3.5.3
-%% |
-%% v
-%% 3.6
-%% |
-%% v
-%% 3.6.0.1
-%% |
-%% v
-%% 3.6.1
-%% |
-%% v
-%% 3.6.2
-%% / \
-%% | |
-%% v |
-%% 3.7 3.6.3
-%% | |
-%% v v
-%% 3.7.1 <- 3.6.4
-%% | |
-%% v v
-%% 3.7.2 <- 3.6.5
-%% | |
-%% v v
-%% 3.7.3 <- 3.6.6
-%% | |
-%% v v
-%% 3.7.4 <- 3.6.7
-%% | |
-%% v v
-%% 3.7.5 <- 3.6.9
-%% |
-%% v
-%% 3.8
-%% |
-%% v
-%% 3.8.1
-%% |
-%% v
-%% 3.8.2
-%% |
-%% v
-%% 3.9
-%% |
-%% v
-%% 3.9.1
-%% |
-%% v
-%% 3.9.1.1
-%% |
-%% v
-%% 3.9.2
-%% |
-%% v
-%% 3.9.3
-%% |
-%% v
-%% 3.9.4
-%% |
-%% v
-%% 3.10
-%% |
-%% v
-%% 3.10.0.1
-%% |
-%% v
-%% 3.10.1
-%% |
-%% v
-%% 3.11
-%% |
-%% v
-%% 3.11.1
-%% |
-%% v
-%% 3.11.2
-%% |
-%% v
-%% 3.11.3
-%% |
-%% v
-%% 3.12
-%% |
-%% v
-%% 3.13
-%% |
-%% v
-%% 3.14
-%% |
-%% v
-%% 3.14.1
-%% |
-%% v
-%% 3.14.1.1
-%% |
-%% v
-%% 3.15
-%% |
-%% v
-%% 3.15.1
-%% |
-%% v
-%% 3.15.1.1
+%% 3.4.3
+%% |
+%% v
+%% 3.4.4
+%% / \
+%% | |
+%% v v
+%% 3.5 3.4.5
+%% | |
+%% v v
+%% 3.5.1 <- 3.4.6
+%% |
+%% v
+%% 3.5.2
+%% |
+%% v
+%% 3.5.3
+%% |
+%% v
+%% 3.6
+%% |
+%% v
+%% 3.6.0.1
+%% |
+%% v
+%% 3.6.1
+%% |
+%% v
+%% 3.6.2
+%% / \
+%% | |
+%% v v
+%% 3.7 3.6.3
+%% | |
+%% v v
+%% 3.7.1 <- 3.6.4
+%% | |
+%% v v
+%% 3.7.2 <- 3.6.5
+%% | |
+%% v v
+%% 3.7.3 <- 3.6.6
+%% | |
+%% v v
+%% 3.7.4 <- 3.6.7
+%% | |
+%% v v
+%% 3.7.5 <- 3.6.9
+%% |
+%% v
+%% 3.8
+%% |
+%% v
+%% 3.8.1
+%% |
+%% v
+%% 3.8.2
+%% |
+%% v
+%% 3.9
+%% |
+%% v
+%% 3.9.1
+%% |
+%% v
+%% 3.9.1.1
+%% |
+%% v
+%% 3.9.2
+%% |
+%% v
+%% 3.9.3
+%% |
+%% v
+%% 3.9.4
+%% |
+%% v
+%% 3.10
+%% |
+%% v
+%% 3.10.0.1
+%% |
+%% v
+%% 3.10.1
+%% |
+%% v
+%% 3.11
+%% |
+%% v
+%% 3.11.1
+%% |
+%% v
+%% 3.11.2
+%% |
+%% v
+%% 3.11.3
+%% / \
+%% | \
+%% v \
+%% 3.12 \
+%% | \
+%% v \
+%% 3.13 \
+%% | \
+%% v |
+%% 3.14 |
+%% | |
+%% v |
+%% 3.14.1 |
+%% | |
+%% v |
+%% 3.14.1.1 |
+%% / \ |
+%% / \ |
+%% | | |
+%% v | |
+%% 3.15 | |
+%% | | |
+%% v | |
+%% 3.15.1 | |
+%% | | |
+%% v | |
+%% 3.15.1.1 | |
+%% | | |
+%% v v v
+%% 3.15.2 <- 3.14.2 <- 3.11.4
%%
%%
{"%VSN%",
[
+ {"3.15.1.1",
+ [
+ {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_15_2},
+ soft_purge, soft_purge, []}
+ ]
+ },
{"3.15.1",
[
+ {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_15_2},
+ soft_purge, soft_purge, []}
]
},
{"3.15",
@@ -155,13 +169,23 @@
{load_module, megaco_timer, soft_purge, soft_purge, [megaco_config_misc]},
{update, megaco_config, soft, soft_purge, soft_purge,
[megaco_timer, megaco_config_misc]},
+ {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_15_2},
+ soft_purge, soft_purge, []},
{add_module, megaco_config_misc}
]
}
],
[
+ {"3.15.1.1",
+ [
+ {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_15_2},
+ soft_purge, soft_purge, []}
+ ]
+ },
{"3.15.1",
[
+ {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_15_2},
+ soft_purge, soft_purge, []}
]
},
{"3.15",
@@ -171,6 +195,8 @@
{load_module, megaco_filter, soft_purge, soft_purge, []},
{load_module, megaco_timer, soft_purge, soft_purge, [megaco_config]},
{update, megaco_config, soft, soft_purge, soft_purge, []},
+ {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_15_2},
+ soft_purge, soft_purge, []},
{remove, {megaco_config_misc, soft_purge, brutal_purge}}
]
}