diff options
author | Marcus Arendt <[email protected]> | 2014-08-28 10:26:04 +0200 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2014-08-28 10:26:04 +0200 |
commit | deb3008fb728f2089e844a53c95a8d7bfb4dfb5c (patch) | |
tree | 5cf9b6b6bdf87546fd38f90da8a5d51440dfbcb2 /lib/kernel | |
parent | 2fbce26b3fe4bd7b4401f0e1313b778c38be36b2 (diff) | |
parent | f5b36fc72e1ac37d00f82b7651b7ca06a628097f (diff) | |
download | otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.gz otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.tar.bz2 otp-deb3008fb728f2089e844a53c95a8d7bfb4dfb5c.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/test/gen_tcp_misc_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/gen_tcp_misc_SUITE.erl b/lib/kernel/test/gen_tcp_misc_SUITE.erl index 2df4bf7c95..4e4aeb67e2 100644 --- a/lib/kernel/test/gen_tcp_misc_SUITE.erl +++ b/lib/kernel/test/gen_tcp_misc_SUITE.erl @@ -882,7 +882,7 @@ passive_sockets_server_send(Socket, X) -> accept_closed_by_other_process(doc) -> ["Tests the return value from gen_tcp:accept when ", - "the socket is closed from an other process. (OTP-3817)"]; + "the socket is closed from another process. (OTP-3817)"]; accept_closed_by_other_process(Config) when is_list(Config) -> ?line Parent = self(), ?line {ok, ListenSocket} = gen_tcp:listen(0, []), |