diff options
| author | Sverker Eriksson <[email protected]> | 2018-02-12 13:32:51 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-02-12 13:32:51 +0100 |
| commit | 06e88d07a4719a0e15b4e666b16347fad463cee6 (patch) | |
| tree | e340fa0359eeac5906ccb06a6f6adfcc0fc70718 /erts/emulator/beam/atom.names | |
| parent | 194513197e19cd592f3f5c2231510542f5193fe4 (diff) | |
| parent | ecea4b22696dc2aaa57d9f9750fe07efb6b71cde (diff) | |
| download | otp-06e88d07a4719a0e15b4e666b16347fad463cee6.tar.gz otp-06e88d07a4719a0e15b4e666b16347fad463cee6.tar.bz2 otp-06e88d07a4719a0e15b4e666b16347fad463cee6.zip | |
Merge 'sverker/maint-19/alloc-n-migration/ERIERL-88'
into 'sverker/maint-20/alloc-n-migration/ERIERL-88'
OTP-14915
OTP-14916
OTP-14917
OTP-14918
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 |