diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-10-24 14:20:26 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-10-24 14:20:26 +0200 |
| commit | d5733bc3e34449affde2594d85b905c8ab440d42 (patch) | |
| tree | 4744a65c8d163ef261f56d70ff7b4bf975a2aa28 /erts/emulator/beam/atom.names | |
| parent | e85c4dda93e416e8e97c0dcfadc5eeaf5bd8b4e1 (diff) | |
| parent | 6f0a76a0f78f3483b561b5e59260e8ca968b052c (diff) | |
| download | otp-d5733bc3e34449affde2594d85b905c8ab440d42.tar.gz otp-d5733bc3e34449affde2594d85b905c8ab440d42.tar.bz2 otp-d5733bc3e34449affde2594d85b905c8ab440d42.zip | |
Merge branch 'egil/ensure-erl_crash.dump/OTP-10422' into maint
* egil/ensure-erl_crash.dump/OTP-10422:
test: Relax timeouts for heart_SUITE
erts: Fix crash dump write to port hack
erts: Fix lock check assertion
doc: Document ERL_CRASH_DUMP_SECONDS behaviour
test: Add test for heart restart on crash
test: Add test for heart restart on crash
erts: Change ERL_CRASH_DUMP_SECONDS behaviour
test: Refactor away ?line macros in heart_SUITE
erts: Search for heart in ports that are alive
heart: Refactor heart debugging
erts, heart: Ensure erl_crash.dump is written
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 106fad030b..afcbd732df 100644 --- a/erts/emulator/beam/atom.names +++ b/erts/emulator/beam/atom.names @@ -252,6 +252,7 @@ atom heap_block_size atom heap_size atom heap_sizes atom heap_type +atom heart_port atom heir atom hidden atom hide |