diff options
author | Siri Hansen <[email protected]> | 2013-02-07 14:35:47 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2013-02-07 14:35:47 +0100 |
commit | 508c3e6a2405a57685ca012727f9dd329c9b5044 (patch) | |
tree | f29edbc216443515e9fa79aad5636e0edd86d33d /lib/sasl | |
parent | f7eed05cb052fd479efaa7607118bf74b523ec33 (diff) | |
parent | 508370550905121a521d4e01858dfdac422a60d4 (diff) | |
download | otp-508c3e6a2405a57685ca012727f9dd329c9b5044.tar.gz otp-508c3e6a2405a57685ca012727f9dd329c9b5044.tar.bz2 otp-508c3e6a2405a57685ca012727f9dd329c9b5044.zip |
Merge branch 'siri/sasl/appup-R16/OTP-10806'
* siri/sasl/appup-R16/OTP-10806:
Update sasl.appup.src with R16 release and remove R13 versions
Diffstat (limited to 'lib/sasl')
-rw-r--r-- | lib/sasl/src/sasl.appup.src | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index ce4aa1f8f8..a4a38ee40a 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -1,7 +1,7 @@ %% -*- erlang -*- %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2011. All Rights Reserved. +%% Copyright Ericsson AB 1999-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 @@ -17,11 +17,13 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max two major revisions back - [{<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 - {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14B04 (and later?) - {<<"2\\.1\\.[6-9](\\.[0-9]+)*">>,[restart_new_emulator]}],%% R13B-R14B03 + [{<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 + {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14B04 + {<<"2\\.1\\.9\\.[24](\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14B-R14B03 %% Down to - max two major revisions back - [{<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 - {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14B04 (and later?) - {<<"2\\.1\\.[6-9](\\.[0-9]+)*">>,[restart_new_emulator]}] %% R13B-R14B03 + [{<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15 + {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R14B04 + {<<"2\\.1\\.9\\.[24](\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14B-R14B03 }. |