diff options
| author | Björn Gustavsson <[email protected]> | 2015-09-21 10:53:49 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-09-21 10:53:49 +0200 |
| commit | c2fd9dc8a249a4cb093e9133fd3a3cf0d6711ff5 (patch) | |
| tree | dd98e48e713880850a3fe98fd75b6cddc861c772 | |
| parent | 41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8 (diff) | |
| parent | 3524231c8142165f4c468de2b76b3cb5a5139c2c (diff) | |
| download | otp-c2fd9dc8a249a4cb093e9133fd3a3cf0d6711ff5.tar.gz otp-c2fd9dc8a249a4cb093e9133fd3a3cf0d6711ff5.tar.bz2 otp-c2fd9dc8a249a4cb093e9133fd3a3cf0d6711ff5.zip | |
Merge branch 'siri/sasl-vsn-OTP-18.1' into maint
* siri/sasl-vsn-OTP-18.1:
Update sasl vsn to 2.6
| -rw-r--r-- | lib/sasl/src/sasl.appup.src | 6 | ||||
| -rw-r--r-- | lib/sasl/vsn.mk | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src index eddb5a3fd0..2c8812f566 100644 --- a/lib/sasl/src/sasl.appup.src +++ b/lib/sasl/src/sasl.appup.src @@ -18,7 +18,9 @@ %% %CopyrightEnd% {"%VSN%", %% Up from - max one major revision back - [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 + [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.* + {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}], % OTP-17 %% Down to - max one major revision back - [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 + [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, % OTP-18.0.* + {<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]}] % OTP-17 }. diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk index 9e69ddab65..959d9c88d5 100644 --- a/lib/sasl/vsn.mk +++ b/lib/sasl/vsn.mk @@ -1 +1 @@ -SASL_VSN = 2.5.1 +SASL_VSN = 2.6 |