diff options
| author | Rickard Green <[email protected]> | 2015-11-12 16:15:05 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-11-12 16:15:05 +0100 |
| commit | 4f815fab536a3ec1839c2590b8f4f169a27fccac (patch) | |
| tree | 49d1539f21954ffcdcb2523de1319d2d3efbf0ef /erts/emulator/beam/atom.names | |
| parent | ef72a791f4dc9a1816ac8ff95a612409b86de818 (diff) | |
| parent | 3ac08f9b668613a4292436979eacc61863c2ab94 (diff) | |
| download | otp-4f815fab536a3ec1839c2590b8f4f169a27fccac.tar.gz otp-4f815fab536a3ec1839c2590b8f4f169a27fccac.tar.bz2 otp-4f815fab536a3ec1839c2590b8f4f169a27fccac.zip | |
Merge branch 'rickard/ohmq/OTP-13047'
* rickard/ohmq/OTP-13047:
Fragmented young heap generation and off_heap_message_queue option
Refactor GC
Introduce literal tag
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/erl_gc.c
Diffstat (limited to 'erts/emulator/beam/atom.names')
| -rw-r--r-- | erts/emulator/beam/atom.names | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names index 967cf013f0..ea04495574 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -423,6 +423,7 @@ atom notify atom notsup atom nouse_stdio atom objects +atom off_heap_message_queue atom offset atom ok atom old_heap_block_size |