aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tools
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-08-31 10:28:02 +0200
committerRaimo Niskanen <[email protected]>2016-08-31 10:28:02 +0200
commitbba0f5924fa9478d41903331a3285f117c112731 (patch)
tree9e7c0d70d7c9ddf36d4e72a92439dc0ecb852cb2 /lib/tools
parent794c7616a5627fde16b954ffc609149e41429a9f (diff)
parent96da2a50c90fcad84a8776f8c1dac008a6b24b39 (diff)
downloadotp-bba0f5924fa9478d41903331a3285f117c112731.tar.gz
otp-bba0f5924fa9478d41903331a3285f117c112731.tar.bz2
otp-bba0f5924fa9478d41903331a3285f117c112731.zip
Merge branch 'raimo/gen_statem-callback_mode/OTP-13752' into maint
* raimo/gen_statem-callback_mode/OTP-13752: ssl: Upgrade suite testing skipped if stdlib upgrade is required Fix version numbers and dependencies Conflicts: lib/ssl/src/ssl.appup.src lib/ssl/vsn.mk
Diffstat (limited to 'lib/tools')
-rw-r--r--lib/tools/src/tools.app.src2
-rw-r--r--lib/tools/vsn.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index a00969eabe..18166cceb0 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -40,7 +40,7 @@
{env, [{file_util_search_methods,[{"", ""}, {"ebin", "esrc"}, {"ebin", "src"}]}
]
},
- {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14",
+ {runtime_dependencies, ["stdlib-3.1","runtime_tools-1.8.14",
"kernel-3.0","inets-5.10","erts-7.0",
"compiler-5.0"]}
]
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index e6287b0430..e066dbf5e9 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.8.5
+TOOLS_VSN = 2.8.6