aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2015-09-21 09:53:12 +0200
committerHans Bolinder <[email protected]>2015-09-21 09:53:12 +0200
commitcc4d2fda78255b183014490fa108e30ff7d65e71 (patch)
tree5bedd1c4a735ef79656a5484ae3be2456c0c23d2 /lib/stdlib
parent986683dcfff264e55e854c9566281b0f4c0e2d43 (diff)
parent41dbb04aa2f88192d6aa2d55fd7ea82a9f07c0f8 (diff)
downloadotp-cc4d2fda78255b183014490fa108e30ff7d65e71.tar.gz
otp-cc4d2fda78255b183014490fa108e30ff7d65e71.tar.bz2
otp-cc4d2fda78255b183014490fa108e30ff7d65e71.zip
Merge branch 'maint'
* maint: Update application versions
Diffstat (limited to 'lib/stdlib')
-rw-r--r--lib/stdlib/src/stdlib.app.src2
-rw-r--r--lib/stdlib/src/stdlib.appup.src6
-rw-r--r--lib/stdlib/vsn.mk2
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 4400956943..7f9bbbf649 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -105,7 +105,7 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-2.4","kernel-4.0","erts-7.0","crypto-3.3",
+ {runtime_dependencies, ["sasl-2.6","kernel-4.1","erts-7.0","crypto-3.3",
"compiler-5.0"]}
]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 828e1d9aa4..5f61752655 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -18,7 +18,9 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max one major revision back
- [{<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0-17.5
+ [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, %% OTP-18.0.*
+ {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}], %% 17.0-17.5
%% Down to - max one major revision back
- [{<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0-17.5
+ [{<<"2\\.5(\\.[0-9]+)*">>,[restart_new_emulator]}, %% OTP-18.0.*
+ {<<"2\\.[0-4](\\.[0-9]+)*">>,[restart_new_emulator]}] %% 17.0-17.5
}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index dbe5e04d60..3387d74e57 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 2.5.1
+STDLIB_VSN = 2.6