diff options
| author | Erlang/OTP <[email protected]> | 2014-04-10 04:46:09 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-04-10 04:46:09 +0200 |
| commit | 95251f1c2b7c74a790c7112f56b6204172822800 (patch) | |
| tree | 89125080b71cf7cf62b2b89c4d609de05a7ff770 /erts | |
| parent | 3ca49505036d2300cc5119ff076475c37a9d92ee (diff) | |
| parent | 44648ef43dc7cf2929a9df34025e93369776747f (diff) | |
| download | otp-95251f1c2b7c74a790c7112f56b6204172822800.tar.gz otp-95251f1c2b7c74a790c7112f56b6204172822800.tar.bz2 otp-95251f1c2b7c74a790c7112f56b6204172822800.zip | |
Merge branch 'rickard/sys_info_spec/OTP-11859' into maint-17
* rickard/sys_info_spec/OTP-11859:
Fixed type spec of erlang:system_info/1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 98240 -> 98248 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
2 files changed, 0 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex b4e22f6d74..e19bb370bc 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index cabbbd191f..1508eed9ee 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2264,7 +2264,6 @@ tuple_to_list(_Tuple) -> (modified_timing_level) -> integer() | undefined; (multi_scheduling) -> disabled | blocked | enabled; (multi_scheduling_blockers) -> [PID :: pid()]; - (otp_correction_package) -> string(); (otp_release) -> string(); (port_count) -> non_neg_integer(); (port_limit) -> pos_integer(); |