diff options
| author | Lukas Larsson <[email protected]> | 2019-01-15 16:22:37 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-15 16:22:37 +0100 |
| commit | 640851869321694b57f701399c19e093d9bd1dad (patch) | |
| tree | 0a33478fce6b43faeebcc09c084dfde91c3b54f1 /erts/preloaded | |
| parent | a9b0c987fc6fc6ba11a3db523e4b8afb79c1b69f (diff) | |
| parent | 5f5d0b3dd311ef16b7c6cc61d575cd7e5eccc291 (diff) | |
| download | otp-640851869321694b57f701399c19e093d9bd1dad.tar.gz otp-640851869321694b57f701399c19e093d9bd1dad.tar.bz2 otp-640851869321694b57f701399c19e093d9bd1dad.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/bif.c
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/preloaded/ebin/prim_file.beam
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 99848 -> 99948 bytes | |||
| -rw-r--r-- | erts/preloaded/ebin/erts_internal.beam | bin | 17800 -> 17788 bytes | |||
| -rw-r--r-- | erts/preloaded/ebin/prim_file.beam | bin | 28088 -> 28072 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 6 |
4 files changed, 5 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex a067aed7b3..1b0cb5b50c 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex 2e7f873426..b3af713809 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam diff --git a/erts/preloaded/ebin/prim_file.beam b/erts/preloaded/ebin/prim_file.beam Binary files differindex 49feb950a8..b9f4791ba9 100644 --- a/erts/preloaded/ebin/prim_file.beam +++ b/erts/preloaded/ebin/prim_file.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 7998d0d5f7..65716def11 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2526,6 +2526,9 @@ subtract(_,_) -> OldSchedulersOnline when SchedulersOnline :: pos_integer(), OldSchedulersOnline :: pos_integer(); + (system_logger, Logger) -> PrevLogger when + Logger :: logger | undefined | pid(), + PrevLogger :: logger | undefined | pid(); (trace_control_word, TCW) -> OldTCW when TCW :: non_neg_integer(), OldTCW :: non_neg_integer(); @@ -2731,8 +2734,9 @@ tuple_to_list(_Tuple) -> (schedulers | schedulers_online) -> pos_integer(); (smp_support) -> boolean(); (start_time) -> integer(); - (system_version) -> string(); (system_architecture) -> string(); + (system_logger) -> logger | undefined | pid(); + (system_version) -> string(); (threads) -> boolean(); (thread_pool_size) -> non_neg_integer(); (time_correction) -> true | false; |