diff options
| author | John Högberg <[email protected]> | 2017-07-04 10:45:51 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2017-07-04 10:45:51 +0200 |
| commit | 4acf549207503d7c80cfbd9f0958aafd10da07d0 (patch) | |
| tree | bbe950aa6dd6d4ac264af149571ebf8113c77135 /lib/kernel | |
| parent | f07821b47f8dcf69be22277e316167491a2ef295 (diff) | |
| parent | a01de6873844ba510084090abec734c4166d71fa (diff) | |
| download | otp-4acf549207503d7c80cfbd9f0958aafd10da07d0.tar.gz otp-4acf549207503d7c80cfbd9f0958aafd10da07d0.tar.bz2 otp-4acf549207503d7c80cfbd9f0958aafd10da07d0.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
erts: Fix bug in quick alloc
Fix old length usage in string
stdlib: Fix bug in proc_lib
Support arbitrary crash report in proc_lib.
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/test/gen_tcp_misc_SUITE.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl index 2f28806339..331864b5de 100644 --- a/lib/kernel/test/gen_tcp_misc_SUITE.erl +++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl @@ -50,9 +50,8 @@ killing_acceptor/1,killing_multi_acceptors/1,killing_multi_acceptors2/1, several_accepts_in_one_go/1, accept_system_limit/1, active_once_closed/1, send_timeout/1, send_timeout_active/1, - otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1, - wrapping_oct/0, wrapping_oct/1, - otp_9389/1, otp_13939/1]). + otp_7731/1, zombie_sockets/1, otp_7816/1, otp_8102/1, + wrapping_oct/0, wrapping_oct/1, otp_9389/1, otp_13939/1]). %% Internal exports. -export([sender/3, not_owner/1, passive_sockets_server/2, priority_server/1, |