diff options
| author | Lukas Larsson <[email protected]> | 2016-09-06 09:56:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-09-06 09:56:53 +0200 |
| commit | 64a986cda04f70cc071e047ea3ae19e324ea6397 (patch) | |
| tree | b29aaa78db2b90d51889888cdbaa5e5b4b49c4b2 /erts/emulator/beam/atom.names | |
| parent | 678238add716b10731688de4d9e4144d04e0a55d (diff) | |
| parent | 99701ee7b52f5010da7c8540bbb35481bee053bf (diff) | |
| download | otp-64a986cda04f70cc071e047ea3ae19e324ea6397.tar.gz otp-64a986cda04f70cc071e047ea3ae19e324ea6397.tar.bz2 otp-64a986cda04f70cc071e047ea3ae19e324ea6397.zip | |
Merge branch 'kvakvs/erts/gc_minor_option/OTP-11695'
* kvakvs/erts/gc_minor_option/OTP-11695:
erts: Fix req_system_task gc typespec
Fix process_SUITE system_task_blast and no_priority_inversion2
Option to erlang:garbage_collect to request minor (generational) GC
Conflicts:
erts/emulator/beam/erl_process.c
erts/preloaded/src/erts_internal.erl
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 9dae67cb2d..437cbddde7 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -366,6 +366,7 @@ atom long_schedule atom low atom Lt='<' atom machine +atom major atom match atom match_limit atom match_limit_recursion @@ -395,6 +396,7 @@ atom milli_seconds atom millisecond atom min_heap_size atom min_bin_vheap_size +atom minor atom minor_version atom Minus='-' atom module |