aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-11-27 15:05:57 +0100
committerHans Nilsson <[email protected]>2015-11-27 15:05:57 +0100
commit8574c1ad8dd5ae8b4d7234fd97f1c33c71710ab0 (patch)
tree7cb438b493177c8ab6d7d0ad730dbf0ae6626a08 /erts/emulator
parentb916edc72a8eb82068229222abde1b9ff43dbad2 (diff)
parentc24a4bf84029d06cc79f49634684cd6d2eeafb62 (diff)
downloadotp-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 'erts/emulator')
0 files changed, 0 insertions, 0 deletions