aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-12-28 13:56:05 +0100
committerZandra <[email protected]>2015-12-28 13:56:05 +0100
commit0e95d23964d6a6e90a39d7e038f21870c6cce485 (patch)
treed5106d5c6293b33802f69c624f3361058e834bf7 /erts
parent788cd43bfdc56a5c4ac99049af8ab31a1170ec1b (diff)
parenteb8c76c5672f71b860a7b05390e7f1ecbb6e1b9e (diff)
downloadotp-0e95d23964d6a6e90a39d7e038f21870c6cce485.tar.gz
otp-0e95d23964d6a6e90a39d7e038f21870c6cce485.tar.bz2
otp-0e95d23964d6a6e90a39d7e038f21870c6cce485.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/epmd/src/epmd_srv.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
index 829eb4c74d..20ad0af829 100644
--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
@@ -695,9 +695,6 @@ static void do_request(g, fd, s, buf, bsize)
put_int16(node->creation, wbuf+2);
}
- if (g->delay_write) /* Test of busy server */
- sleep(g->delay_write);
-
if (reply(g, fd, wbuf, 4) != 4)
{
dbg_tty_printf(g,1,"** failed to send ALIVE2_RESP for \"%s\"",