diff options
| author | Rickard Green <[email protected]> | 2016-08-29 17:52:10 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 17:52:10 +0200 |
| commit | 928d74ffa09bd56652d9390b02fa51ef51d71d51 (patch) | |
| tree | bfb9cd9e76d4ef766dbcd999adf16c700350b399 /erts/preloaded/src/erts.app.src | |
| parent | 69d442f8afc67aef33c70d68d7eaab2bdad1400f (diff) | |
| parent | 9d0638216d35ca0f21c1eea20f8daa3992ac4f71 (diff) | |
| download | otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.tar.gz otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.tar.bz2 otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.zip | |
Merge branch 'rickard/fun-purge-bug/OTP-13809' and 'rickard/new-purge-strategy/OTP-13833' into maint
* rickard/fun-purge-bug/OTP-13809:
Fix purge of code
Reclaim literal area after purge has completed
Separate literal area from code
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_init.c
erts/preloaded/ebin/init.beam
Diffstat (limited to 'erts/preloaded/src/erts.app.src')
| -rw-r--r-- | erts/preloaded/src/erts.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src index e18da28905..7ab06164b4 100644 --- a/erts/preloaded/src/erts.app.src +++ b/erts/preloaded/src/erts.app.src @@ -37,7 +37,7 @@ {registered, []}, {applications, []}, {env, []}, - {runtime_dependencies, ["stdlib-3.0", "kernel-5.0", "sasl-3.0"]} + {runtime_dependencies, ["stdlib-3.0", "kernel-5.0", "sasl-3.0.1"]} ]}. %% vim: ft=erlang |