From 3524231c8142165f4c468de2b76b3cb5a5139c2c Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Thu, 17 Sep 2015 12:36:51 +0200
Subject: Update sasl vsn to 2.6

---
 lib/sasl/src/sasl.appup.src | 6 ++++--
 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
-- 
cgit v1.2.3