aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ic
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-02-22 12:13:18 +0100
committerHans Nilsson <[email protected]>2018-02-22 12:13:18 +0100
commit41979694d18637c62433a44aaf4a07b2e02e104d (patch)
treee3be25825b8cb63e693f640840ab2dfa79f11d45 /lib/ic
parent1540a0758b8d60af7b3832158015bd8cf64016af (diff)
parent398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff)
downloadotp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.gz
otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.bz2
otp-41979694d18637c62433a44aaf4a07b2e02e104d.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release ssh: Add option save_accepted_host ssh: No error message for signal kill ssh: Dont repeat supervisor defaults in map fields ssh: Move starting of channel child to ssh_channel_sup ssh: Test case for sup tree when shell server proc times out Conflicts: OTP_VERSION
Diffstat (limited to 'lib/ic')
0 files changed, 0 insertions, 0 deletions