diff options
| author | Lukas Larsson <[email protected]> | 2013-09-30 14:22:54 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-09-30 14:22:54 +0200 |
| commit | b44a8d0e488be8ecbb018fbdb3926e129caf0ed0 (patch) | |
| tree | 159270f0404e7dc8d668ca9e23cf96c8de4a48d4 /erts/preloaded/src/erlang.erl | |
| parent | b4f5a3a238cc726b215c6c34484d4cb5299aff33 (diff) | |
| parent | c5459f9ba0e8b3568a34788bfd596f5f6be9fca2 (diff) | |
| download | otp-b44a8d0e488be8ecbb018fbdb3926e129caf0ed0.tar.gz otp-b44a8d0e488be8ecbb018fbdb3926e129caf0ed0.tar.bz2 otp-b44a8d0e488be8ecbb018fbdb3926e129caf0ed0.zip | |
Merge branch 'maint'
* maint:
Update preloaded
add system_info(ets_limit)
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index f4f3918550..2026d9e6d2 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2099,13 +2099,14 @@ tuple_to_list(_Tuple) -> (creation) -> integer(); (debug_compiled) -> boolean(); (dist) -> binary(); + (dist_buf_busy_limit) -> non_neg_integer(); (dist_ctrl) -> {Node :: node(), ControllingEntity :: port() | pid()}; (driver_version) -> string(); (dynamic_trace) -> none | dtrace | systemtap; (dynamic_trace_probes) -> boolean(); (elib_malloc) -> false; - (dist_buf_busy_limit) -> non_neg_integer(); + (ets_limit) -> pos_integer(); (fullsweep_after) -> {fullsweep_after, non_neg_integer()}; (garbage_collection) -> [{atom(), integer()}]; (heap_sizes) -> [non_neg_integer()]; |