diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:30:22 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:30:22 +0200 |
| commit | eedd89fcb0b892117b798b8b097cf63b9ab59db7 (patch) | |
| tree | f9dfcca0ea758fca35f6f94b98c4b013ac255103 /erts/emulator/beam/atom.names | |
| parent | 620b7e879c9943e1e79990ed0a825228f7b18b04 (diff) | |
| parent | eb4d4c133a8c2ad00807888289cb99d67f70896f (diff) | |
| download | otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.tar.gz otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.tar.bz2 otp-eedd89fcb0b892117b798b8b097cf63b9ab59db7.zip | |
Merge branch 'pan/r16b01/system_monitor_long_schedule/OTP-11067' into maint
* pan/r16b01/system_monitor_long_schedule/OTP-11067:
Minor spelling correction
Add system_monitor of long_schedule
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 7d86e486f1..3ee9eb0f88 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -178,6 +178,7 @@ atom disable_trace atom disabled atom display_items atom dist +atom dist_cmd atom Div='/' atom div atom dlink @@ -313,6 +314,7 @@ atom load_cancelled atom load_failure atom local atom long_gc +atom long_schedule atom low atom Lt='<' atom machine @@ -432,6 +434,7 @@ atom port atom ports atom port_count atom port_limit +atom port_op atom print atom priority atom private @@ -443,6 +446,7 @@ atom process_display atom process_limit atom process_dump atom procs +atom proc_sig atom profile atom protected atom protection |