diff options
author | Rickard Green <[email protected]> | 2014-09-25 17:05:48 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2014-09-25 17:05:48 +0200 |
commit | 3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61 (patch) | |
tree | 1bee4fc91742e3291792caacc61d20a67a80300d /erts/preloaded/src/zlib.erl | |
parent | 743ed31108ee555db18d9833186865e85e34333e (diff) | |
parent | 6084a42a24fca52a5de2bc487c0cd2be46dcc21f (diff) | |
download | otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.gz otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.bz2 otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.zip |
Merge branch 'rickard/eager-check-io/OTP-12117' into rickard/maint-17/eager-check-io/OTP-12117
* rickard/eager-check-io/OTP-12117:
Introduce support for eager check I/O scheduling
Conflicts:
erts/emulator/beam/erl_bif_info.c
erts/emulator/beam/erl_init.c
erts/emulator/beam/erl_process.c
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded/src/zlib.erl')
0 files changed, 0 insertions, 0 deletions