diff options
| author | Rickard Green <[email protected]> | 2013-12-07 00:19:05 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-12-07 00:19:05 +0100 |
| commit | 9232f50d4cbe7b051dfd3e83625de0b22536c4c4 (patch) | |
| tree | f3c52ccc719a9df7a0714de05e2d1e9dde700df0 /bootstrap | |
| parent | 3c00452a81dfde57f85c882029186cfa3c0d348d (diff) | |
| parent | 9f1f0bff7f98d62f8406e5ecd76f6eb7c1a66ff3 (diff) | |
| download | otp-9232f50d4cbe7b051dfd3e83625de0b22536c4c4.tar.gz otp-9232f50d4cbe7b051dfd3e83625de0b22536c4c4.tar.bz2 otp-9232f50d4cbe7b051dfd3e83625de0b22536c4c4.zip | |
Merge branch 'rickard/garbage_collect/OTP-11388'
* rickard/garbage_collect/OTP-11388:
Parallel check_process_code when code_server purge a module
Functionality for disabling garbage collection
Use asynchronous check_process_code in code_parallel_SUITE
Execution of system tasks in context of another process
Conflicts:
bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'bootstrap')
| -rw-r--r-- | bootstrap/lib/kernel/ebin/code_server.beam | bin | 26384 -> 28536 bytes |
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/erl_internal.beam | bin | 5176 -> 5200 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/bootstrap/lib/kernel/ebin/code_server.beam b/bootstrap/lib/kernel/ebin/code_server.beam Binary files differindex 89417b095b..896e3cb61b 100644 --- a/bootstrap/lib/kernel/ebin/code_server.beam +++ b/bootstrap/lib/kernel/ebin/code_server.beam diff --git a/bootstrap/lib/stdlib/ebin/erl_internal.beam b/bootstrap/lib/stdlib/ebin/erl_internal.beam Binary files differindex d8c77627f1..01c6598cdc 100644 --- a/bootstrap/lib/stdlib/ebin/erl_internal.beam +++ b/bootstrap/lib/stdlib/ebin/erl_internal.beam |