diff options
| author | Hans Nilsson <[email protected]> | 2015-11-27 15:05:57 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-11-27 15:05:57 +0100 |
| commit | 8574c1ad8dd5ae8b4d7234fd97f1c33c71710ab0 (patch) | |
| tree | 7cb438b493177c8ab6d7d0ad730dbf0ae6626a08 /OTP_VERSION | |
| parent | b916edc72a8eb82068229222abde1b9ff43dbad2 (diff) | |
| parent | c24a4bf84029d06cc79f49634684cd6d2eeafb62 (diff) | |
| download | otp-8574c1ad8dd5ae8b4d7234fd97f1c33c71710ab0.tar.gz otp-8574c1ad8dd5ae8b4d7234fd97f1c33c71710ab0.tar.bz2 otp-8574c1ad8dd5ae8b4d7234fd97f1c33c71710ab0.zip | |
Merge branch 'maint-18' into maint
* maint-18:
Updated OTP version
Update release notes
ssh: vsn.mk updated
ssh: New test cases for SSH_MSG_KEX_DH_GEX_REQUEST_OLD
ssh: update existing testcases
ssh: Improve group selection
ssh: implemented server side SSH_MSG_KEX_DH_GEX_REQUEST_OLD for putty client
Conflicts:
lib/ssh/src/ssh_transport.erl
lib/ssh/test/ssh_protocol_SUITE.erl
lib/ssh/vsn.mk
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 39626521cb..5f8e72c36b 100644 --- a/OTP_VERSION +++ b/OTP_VERSION @@ -1 +1 @@ -18.1.4 +18.1.5 |