diff options
author | Siri Hansen <[email protected]> | 2011-07-11 10:18:29 +0200 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2011-07-11 10:18:29 +0200 |
commit | 2a5d951162e6d9c918132d60c5c39302399dfca4 (patch) | |
tree | 9fea936aaa9b087e841db57ab8dbba23b8b5c4ac /erts/emulator/beam/erl_instrument.c | |
parent | e47607acb1f9aefb65f5613509f902e2f097cffc (diff) | |
parent | f34758a976eebc4a3bc5a42152a5053472db9a85 (diff) | |
download | otp-2a5d951162e6d9c918132d60c5c39302399dfca4.tar.gz otp-2a5d951162e6d9c918132d60c5c39302399dfca4.tar.bz2 otp-2a5d951162e6d9c918132d60c5c39302399dfca4.zip |
Merge branch 'siri/stdlib/count_children_memory-notsup/OTP-9426' into dev
* siri/stdlib/count_children_memory-notsup/OTP-9426:
Make sure supervisor_SUITE:count_children_memory is always skipped when erlang:memory is not supported
Diffstat (limited to 'erts/emulator/beam/erl_instrument.c')
0 files changed, 0 insertions, 0 deletions