diff options
author | Rickard Green <[email protected]> | 2018-10-12 17:47:52 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2018-10-12 17:47:52 +0200 |
commit | 13baa4384c4c9c49e6d540bc8ae6b8946f2454ed (patch) | |
tree | f5b598ca5ced0fbc5c8b200d2a8e730ee9ca6d70 /OTP_VERSION | |
parent | ac243aeb32d3379a51564d4f2312bbb1a00a5271 (diff) | |
parent | d9682b02b81fa6e23e554b6e017650eb89ecebed (diff) | |
download | otp-13baa4384c4c9c49e6d540bc8ae6b8946f2454ed.tar.gz otp-13baa4384c4c9c49e6d540bc8ae6b8946f2454ed.tar.bz2 otp-13baa4384c4c9c49e6d540bc8ae6b8946f2454ed.zip |
Merge branch 'maint-21' into maint
* maint-21:
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 'OTP_VERSION')
-rw-r--r-- | OTP_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OTP_VERSION b/OTP_VERSION index ea8c92af65..2d978e312b 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -21.1 +21.1.1 |