diff options
| author | Sverker Eriksson <[email protected]> | 2018-11-15 16:04:39 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2018-11-15 16:04:39 +0100 |
| commit | 58076e7db30a9f35df729c7e58ebcbe48003bb14 (patch) | |
| tree | dad56d064313b6ad41c94a9b204ef390eeac42d9 /lib/sasl | |
| parent | eddc6f7aa1667eaefe5cb4a26a2d2afd7e96d0f6 (diff) | |
| parent | efe633d2c22daea6225935a2945fa5d3dd70e50c (diff) | |
| download | otp-58076e7db30a9f35df729c7e58ebcbe48003bb14.tar.gz otp-58076e7db30a9f35df729c7e58ebcbe48003bb14.tar.bz2 otp-58076e7db30a9f35df729c7e58ebcbe48003bb14.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/sasl')
| -rw-r--r-- | lib/sasl/src/sasl.app.src | 2 | ||||
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/sasl.app.src b/lib/sasl/src/sasl.app.src index 688aff16f1..5d45af0b50 100644 --- a/lib/sasl/src/sasl.app.src +++ b/lib/sasl/src/sasl.app.src @@ -43,5 +43,5 @@ {env, []}, {mod, {sasl, []}}, {runtime_dependencies, ["tools-2.6.14","stdlib-3.4","kernel-5.3", - "erts-9.0"]}]}. + "erts-@OTP-13468@"]}]}. diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index 072d4ed555..101701cec6 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -1562,7 +1562,7 @@ mandatory_modules() -> preloaded() -> %% Sorted - [erl_init,erl_prim_loader,erl_tracer,erlang, + [atomics,counters,erl_init,erl_prim_loader,erl_tracer,erlang, erts_code_purger,erts_dirty_process_signal_handler, erts_internal,erts_literal_area_collector, init,persistent_term,prim_buffer,prim_eval,prim_file, |