diff options
| author | Hans Nilsson <[email protected]> | 2018-04-24 12:49:05 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-24 12:49:05 +0200 |
| commit | 0de7634ca20ff7d8dec143b92130cd04025557fc (patch) | |
| tree | 65ee857a9d348427f74c784db49215e8ff51bfb6 /lib/kernel/src/inet_res.erl | |
| parent | 0343b68b053ee97b2ef70ea07b9aa87e8842c591 (diff) | |
| parent | 60abdddf4bc5a25ca31af151642ca59c7dd07e92 (diff) | |
| download | otp-0de7634ca20ff7d8dec143b92130cd04025557fc.tar.gz otp-0de7634ca20ff7d8dec143b92130cd04025557fc.tar.bz2 otp-0de7634ca20ff7d8dec143b92130cd04025557fc.zip | |
Merge branch 'maint-18' into maint
* maint-18:
Updated OTP version
Prepare release
ssh: Fix server crashes for exit-normal signals
Conflicts:
OTP_VERSION
lib/ssh/doc/src/notes.xml
lib/ssh/src/ssh_connection_handler.erl
lib/ssh/vsn.mk
otp_versions.table
Diffstat (limited to 'lib/kernel/src/inet_res.erl')
0 files changed, 0 insertions, 0 deletions