diff options
| author | Rickard Green <[email protected]> | 2018-10-12 17:59:18 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-10-12 17:59:18 +0200 |
| commit | 8e65d31faab67b9844bbbaaa6245b2da2dd97b76 (patch) | |
| tree | fec253c9db3c1d24b77f3f4933b8361ef740266b /erts/vsn.mk | |
| parent | e620c8c507c33ebca6216d71a8de73bce2722ac2 (diff) | |
| parent | 13baa4384c4c9c49e6d540bc8ae6b8946f2454ed (diff) | |
| download | otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.tar.gz otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.tar.bz2 otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
erts: Fix UNC path handling on Windows
erts: Fix a compiler warning
eldap: Fix race at socket close
Fix bug for sockopt pktoptions on BSD
erts: Fix memory leak on file read errors
Diffstat (limited to 'erts/vsn.mk')
| -rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 5b187b1f4d..01c19aff2f 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.1 +VSN = 10.1.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |