diff options
| author | Björn Gustavsson <[email protected]> | 2016-09-15 11:40:39 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-09-15 11:40:39 +0200 |
| commit | 687eae1e86817403249f03f534a256a28c5d5251 (patch) | |
| tree | 75369a6be94deb0e0c0ad2287102dbb16c34b026 /erts/preloaded/ebin | |
| parent | 060949fb1ee7d1af366372b43dde5add421a5f73 (diff) | |
| parent | fde238fb52133a6c7a2a3f2a2e16f1c1bef62394 (diff) | |
| download | otp-687eae1e86817403249f03f534a256a28c5d5251.tar.gz otp-687eae1e86817403249f03f534a256a28c5d5251.tar.bz2 otp-687eae1e86817403249f03f534a256a28c5d5251.zip | |
Merge branch 'maint'
* maint:
erts: Add nif_SUITE:t_on_load
erts: Improve nif_SUITE:upgrade test
Don't leak old code when loading a modules with an on_load function
Conflicts:
erts/preloaded/ebin/erts_code_purger.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/src/erts_code_purger.erl
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/erts_code_purger.beam | bin | 10512 -> 11480 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erts_internal.beam | bin | 10880 -> 10872 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erts_code_purger.beam b/erts/preloaded/ebin/erts_code_purger.beam Binary files differindex a012c46396..0161151785 100644 --- a/erts/preloaded/ebin/erts_code_purger.beam +++ b/erts/preloaded/ebin/erts_code_purger.beam diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex 2982fbccbe..0a78c5b6c3 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam |