diff options
| author | Rickard Green <[email protected]> | 2017-06-01 19:56:07 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-06-01 19:56:07 +0200 |
| commit | 5f902e2dbc791373d66f4542a153b827d6b34cb7 (patch) | |
| tree | 6c53194bc97576561795a056d9d549b47609fa86 /lib/megaco | |
| parent | 2b41d8f318b7e5ec139d42fd2f01a132699be839 (diff) | |
| parent | c8f1d8218a2aa01a2b8d4f65af6e07e5ca2b631e (diff) | |
| download | otp-5f902e2dbc791373d66f4542a153b827d6b34cb7.tar.gz otp-5f902e2dbc791373d66f4542a153b827d6b34cb7.tar.bz2 otp-5f902e2dbc791373d66f4542a153b827d6b34cb7.zip | |
Merge branch 'rickard/purge-hibernated' into rickard/purge-hibernated-19
* rickard/purge-hibernated:
Do not GC hibernated process from other processes
Fix check_process_code() on hibernated process
Conflicts:
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_gc.c
erts/emulator/beam/erl_process.h
Diffstat (limited to 'lib/megaco')
0 files changed, 0 insertions, 0 deletions