aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorRickard Green <rickard@erlang.org>2013-12-13 09:58:11 +0100
committerRickard Green <rickard@erlang.org>2013-12-13 09:58:11 +0100
commitaf17798534de376505498b86525ab8618753ebf7 (patch)
treed8d9c88e3b211bedbb0abad1df8208b81904b998 /lib/kernel
parent458e302f61e2de36ebd49c5a5a5b984224bdce94 (diff)
parent51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b (diff)
downloadotp-af17798534de376505498b86525ab8618753ebf7.tar.gz
otp-af17798534de376505498b86525ab8618753ebf7.tar.bz2
otp-af17798534de376505498b86525ab8618753ebf7.zip
Merge branch 'rickard/otp-17-vsn'
* rickard/otp-17-vsn: Update versions of OTP, erts, kernel, and stdlib
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/kernel.appup.src4
-rw-r--r--lib/kernel/vsn.mk2
2 files changed, 3 insertions, 3 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