diff options
| author | Lukas Larsson <[email protected]> | 2014-06-05 11:05:13 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-06-05 11:05:13 +0200 |
| commit | d30fd47e2e886094d72d8dcb00f1392cabeda23f (patch) | |
| tree | c4b0234480e0783a1a3bf74025d71b8f0edd73c6 /erts/preloaded/src/erlang.erl | |
| parent | a219ce0b48b88bd74ed80835982e3f6053bcc6c6 (diff) | |
| parent | 5eb7105fb6f479ed50db5435d510aae0306b8d46 (diff) | |
| download | otp-d30fd47e2e886094d72d8dcb00f1392cabeda23f.tar.gz otp-d30fd47e2e886094d72d8dcb00f1392cabeda23f.tar.bz2 otp-d30fd47e2e886094d72d8dcb00f1392cabeda23f.zip | |
Merge branch 'maint'
* maint:
Add erlang:system_info(tolerant_timeofday)
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index dd3ea87c90..93311ca220 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2286,6 +2286,7 @@ tuple_to_list(_Tuple) -> (system_architecture) -> string(); (threads) -> boolean(); (thread_pool_size) -> non_neg_integer(); + (tolerant_timeofday) -> enabled | disabled; (trace_control_word) -> non_neg_integer(); (update_cpu_info) -> changed | unchanged; (version) -> string(); |