aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2019-02-21 10:40:27 +0100
committerSiri Hansen <[email protected]>2019-02-21 10:40:27 +0100
commit1ebe4074d58068b8187bbe713a76875a406ddda9 (patch)
tree47affc6ab99362a26f103e1f8d9ac82ef5fb570b /lib/sasl
parente0bdf582303be57a2f1a1bf7abe27af102d03c09 (diff)
parent21801003718dd0ca06d5171eb2b4a00790a00d40 (diff)
downloadotp-1ebe4074d58068b8187bbe713a76875a406ddda9.tar.gz
otp-1ebe4074d58068b8187bbe713a76875a406ddda9.tar.bz2
otp-1ebe4074d58068b8187bbe713a76875a406ddda9.zip
Merge branch 'siri/cuddle-master'
* siri/cuddle-master: Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib [logger] Fix faulty report_cb in logger_disk_log_h_SUITE:logging/1 [cdv] Update compiler directive for release compatibility [reltool] Make test pass when $ERL_LIBS is set
Diffstat (limited to 'lib/sasl')
-rw-r--r--lib/sasl/test/test_lib.hrl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/test/test_lib.hrl b/lib/sasl/test/test_lib.hrl
index f5210d4f27..7867d3da39 100644
--- a/lib/sasl/test/test_lib.hrl
+++ b/lib/sasl/test/test_lib.hrl
@@ -1,3 +1,3 @@
-define(ertsvsn,"4.4").
--define(kernelvsn,"5.3").
--define(stdlibvsn,"3.4").
+-define(kernelvsn,"6.0").
+-define(stdlibvsn,"3.5").