aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-01-16 11:46:43 +0100
committerRickard Green <[email protected]>2019-01-16 11:46:43 +0100
commitd8a93cc52fe7342e4a79e396192f63ea673b98f4 (patch)
treee523f499a1c4fd832a3aa922d624567b77c0d103 /erts/vsn.mk
parent04c4d7ec3ea8863b7763ffdf5ba75b0404aee3b6 (diff)
parent3f4b17036bb6dbd302da3c38830512439b146e34 (diff)
downloadotp-d8a93cc52fe7342e4a79e396192f63ea673b98f4.tar.gz
otp-d8a93cc52fe7342e4a79e396192f63ea673b98f4.tar.bz2
otp-d8a93cc52fe7342e4a79e396192f63ea673b98f4.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Prepare release
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r--erts/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 73199cc721..c579b6364a 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.2.1
+VSN = 10.2.2
# Port number 4365 in 4.2
# Port number 4366 in 4.3