diff options
author | Rickard Green <[email protected]> | 2014-11-04 20:43:01 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2014-11-04 20:43:01 +0100 |
commit | 5373d3ac9dd67c0bb593f2d5ed9121d75f27b559 (patch) | |
tree | 0aa0cd1e853ec21e2b3b9395bcddebdb25ae14dd /erts/preloaded/ebin/prim_file.beam | |
parent | 461757503e8ecaaeb3ea9b84f5c0dfccd3408694 (diff) | |
parent | c2fd0dadaeccd42585770fa672acde7bdfae3121 (diff) | |
download | otp-5373d3ac9dd67c0bb593f2d5ed9121d75f27b559.tar.gz otp-5373d3ac9dd67c0bb593f2d5ed9121d75f27b559.tar.bz2 otp-5373d3ac9dd67c0bb593f2d5ed9121d75f27b559.zip |
Merge branch 'rickard/activate-runq/OTP-12287' into rickard/maint-17/activate-runq/OTP-12287
* rickard/activate-runq/OTP-12287:
Do not let non-empty run-queue prevent activation of scheduler
Conflicts:
erts/emulator/beam/erl_process.c
Diffstat (limited to 'erts/preloaded/ebin/prim_file.beam')
0 files changed, 0 insertions, 0 deletions