aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2013-12-10 09:52:50 +0100
committerRickard Green <rickard@erlang.org>2013-12-10 12:27:15 +0100
commit51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b (patch)
tree4173e9a8ed6c3e97327c75ec6d432439abf81abd /lib
parent6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff)
downloadotp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.tar.gz
otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.tar.bz2
otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.zip
Update versions of OTP, erts, kernel, and stdlib
Update versions of OTP, erts, kernel, and stdlib to comply with the new version scheme decided by the OTP technical board.
Diffstat (limited to 'lib')
-rw-r--r--lib/kernel/src/kernel.appup.src4
-rw-r--r--lib/kernel/vsn.mk2
-rw-r--r--lib/stdlib/src/stdlib.appup.src4
-rw-r--r--lib/stdlib/vsn.mk2
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index ae2666d496..b946c2d1af 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -17,11 +17,11 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max two major revisions back
- [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
{<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
%% Down to - max two major revisions back
- [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"3\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
{<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 23af0599fc..dd5316b825 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.17
+KERNEL_VSN = 3.0
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 4c828e4434..749a9a4201 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -17,11 +17,11 @@
%% %CopyrightEnd%
{"%VSN%",
%% Up from - max two major revisions back
- [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
{<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
%% Down to - max two major revisions back
- [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+ [{<<"2\\.0(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
{<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
}.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index c9d596f737..37a6590b06 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 1.20
+STDLIB_VSN = 2.0