diff options
| author | Rickard Green <[email protected]> | 2018-09-06 14:20:22 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-09-06 14:20:22 +0200 |
| commit | eb538b5bff24ba3144f0646e1a24174e62218479 (patch) | |
| tree | f7a18e02fd1cc4f8f5abb04a032afd0cd8095e76 /erts/emulator/beam/dist.c | |
| parent | 6f44c787bd543dbf0f0d7a02baae175e822d5802 (diff) | |
| parent | 30e5321740b96b3a8984611b6f821692716d0555 (diff) | |
| download | otp-eb538b5bff24ba3144f0646e1a24174e62218479.tar.gz otp-eb538b5bff24ba3144f0646e1a24174e62218479.tar.bz2 otp-eb538b5bff24ba3144f0646e1a24174e62218479.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Update release notes
Update version numbers
kernel: Fix missing abort_connection in net_kernel
Prevent inconsistent node lists
Fix an endless rescheduling loop when a process is executing process_info(self(), ...)
Diffstat (limited to 'erts/emulator/beam/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 146c00b07d..ceb89a6910 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -3615,6 +3615,12 @@ static Sint abort_connection(DistEntry* dep, Uint32 conn_id) return 0; } +Sint +erts_abort_connection(DistEntry *dep, Uint32 conn_id) +{ + return abort_connection(dep, conn_id); +} + BIF_RETTYPE erts_internal_abort_connection_2(BIF_ALIST_2) { DistEntry* dep; |