diff options
| author | Siri Hansen <[email protected]> | 2013-04-16 09:35:11 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-04-16 09:35:11 +0200 |
| commit | e4d8cbb58f7ed45098c2bfcd652e18693332c94e (patch) | |
| tree | e6ca001294a9a809025bec8d3e194fd8c66ca8e0 /lib/sasl/src | |
| parent | 34cfc2bfbf4fdbab0dfafb6dced5e555bb8fa594 (diff) | |
| parent | efa025efd47516f58c429a7ec91f6c002e3a9170 (diff) | |
| download | otp-e4d8cbb58f7ed45098c2bfcd652e18693332c94e.tar.gz otp-e4d8cbb58f7ed45098c2bfcd652e18693332c94e.tar.bz2 otp-e4d8cbb58f7ed45098c2bfcd652e18693332c94e.zip | |
Merge branch 'siri/appup-for-r17/OTP-10950'
* siri/appup-for-r17/OTP-10950:
Update sasl version and sasl.appup.src for R17
Update stdlib.appup.src for R17
Update kernel.appup.src for R17
Diffstat (limited to 'lib/sasl/src')
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index a4a38ee40a..0c4d80a74f 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -17,13 +17,11 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max two major revisions back - [{<<"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 + [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}], %% R15 %% Down to - max two major revisions back - [{<<"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 + [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17 + {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16 + {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15 }. |