aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-06-05 11:04:57 +0200
committerLukas Larsson <[email protected]>2014-06-05 11:04:57 +0200
commit5eb7105fb6f479ed50db5435d510aae0306b8d46 (patch)
tree2420afdc8535e091a9aec80ed5d201634e7356b8 /erts/preloaded/src
parentdd764d2a8070111f026aef0d21be1e2a19ad988f (diff)
parente492b43c3e4366e865e5f1c34d0834df2a91d490 (diff)
downloadotp-5eb7105fb6f479ed50db5435d510aae0306b8d46.tar.gz
otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.tar.bz2
otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.zip
Merge branch 'etsukata/system_info_tolerant_timeofday/OTP-11970' into maint
* etsukata/system_info_tolerant_timeofday/OTP-11970: Add erlang:system_info(tolerant_timeofday)
Diffstat (limited to 'erts/preloaded/src')
-rw-r--r--erts/preloaded/src/erlang.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 1508eed9ee..af43be10c6 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();