diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-13 11:59:09 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-13 11:59:09 +0100 |
| commit | dc0b345ae5374a422250c9d2e3bec63e6186afca (patch) | |
| tree | 48a5e92b6ef5c327e7e3d0f15278069eaa7dd24c /erts/emulator/beam/atom.names | |
| parent | b1c7c64315ab93bb6fbed51664baf93ee8ee33f8 (diff) | |
| parent | 309ef748ddc5bde4bcba280ce2739385f27a76e6 (diff) | |
| download | otp-dc0b345ae5374a422250c9d2e3bec63e6186afca.tar.gz otp-dc0b345ae5374a422250c9d2e3bec63e6186afca.tar.bz2 otp-dc0b345ae5374a422250c9d2e3bec63e6186afca.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
erts: Add system_flags(erts_alloc,"+M?sbct *")
erts: Add age order first fit allocator strategies
erts: Refactor erl_ao_firstfit_alloc
erts: Add migration options "acnl" and "acfml"
kernel: Add os:cmd/2 with max_size option
erts: Add more stats for mbcs_pool
erts: Fix alloc_SUITE:migration
stdlib: Make ets_SUITE memory check try again
erts: Improve carrier pool search
erts: Improve alloc_SUITE:migration
erts: Refactor carrier dealloc migration
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index a44d23b181..7b12e5432d 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -578,7 +578,8 @@ atom running_procs atom runtime atom safe atom save_calls -atom scheduler +atom sbct +atom scheduler atom scheduler_id atom scheduler_wall_time atom scheduler_wall_time_all |