diff options
| author | Sverker Eriksson <[email protected]> | 2018-06-04 16:54:32 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-06-04 16:54:32 +0200 |
| commit | 5636f68c0f9784feb435edb426cd9d48b8fe44fe (patch) | |
| tree | bfbf6490a83add79486533784eedb9daf50c4976 /erts/preloaded/ebin | |
| parent | e5a9686cb1a2b21caa3a692d960a841cd954d0ff (diff) | |
| parent | 018983a0d31739f17f82cccca8ad1e05c09ad1e9 (diff) | |
| download | otp-5636f68c0f9784feb435edb426cd9d48b8fe44fe.tar.gz otp-5636f68c0f9784feb435edb426cd9d48b8fe44fe.tar.bz2 otp-5636f68c0f9784feb435edb426cd9d48b8fe44fe.zip | |
Merge branch 'sverker/erlang-memory-fix'
* sverker/erlang-memory-fix:
erts: Purge unused allocation types
erts: Fix erlang:memory for 'processes' and 'processes_used'
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 103344 -> 103296 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 52f4c686a9..99f11495a5 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam |