summaryrefslogtreecommitdiff
path: root/erts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint-17' into maintErland Schönbeck2014-07-115-10/+65
|\
| * Prepare releaseErlang/OTP2014-07-102-1/+20
| * Merge branch 'nox/filelib-wildcard-broken-link' into maint-17Erlang/OTP2014-07-103-9/+45
| |\
| | * Update preloadedSiri Hansen2014-07-091-0/+0
| | * Fix handling of broken symlinks in filelibAnthony Ramine2014-07-092-9/+45
* | | erlang:statistics(runtime) returns millisecondsMagnus Henoch2014-07-021-1/+1
|/ /
* | Prepare releaseErlang/OTP2014-07-012-1/+18
* | vxworks: Fix SYSTEMD_DAEMON_LIBS in configureBjörn-Egil Dahlberg2014-06-301-0/+1
* | erts: Separate ethread inlining from ethread.hBjörn-Egil Dahlberg2014-06-304-26/+52
* | Prepare releaseErlang/OTP2014-06-192-1/+149
* | Merge branch 'egil/fix-doc-links' into maintBjörn-Egil Dahlberg2014-06-181-6/+6
|\ \
| * | doc: Fix broken links in Installation GuideBjörn-Egil Dahlberg2014-06-171-3/+3
| * | doc: Fix broken linksBjörn-Egil Dahlberg2014-06-171-3/+3
* | | Update preloaded modulesMagnus Lidén2014-06-1810-0/+0
* | | Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen2014-06-181-1/+1
|\ \ \ | |/ / |/| |
| * | [upgrade_SUITE] Set previous major to r16bSiri Hansen2014-06-051-1/+1
* | | Merge branch 'bjorn/erts/fix-prim_eval' into maintBjörn Gustavsson2014-06-171-2/+12
|\ \ \
| * | | add_abstract_code: Remove 'from_asm' optionBjörn Gustavsson2014-06-131-2/+12
| | |/ | |/|
* | | Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green2014-06-161-0/+1
|\ \ \
| * | | Fix redefinition of ETHR_FORCE_INLINERickard Green2014-06-161-0/+1
* | | | Merge branch 'sverk/ethr_aux-cache-align-bug' into maintSverker Eriksson2014-06-131-3/+3
|\ \ \ \
| * | | | erts: Fix cache line alignment bug for ts_event_poolSverker Eriksson2014-06-041-3/+3
* | | | | Merge branch 'sverk/etp-alloc-stats' into maintSverker Eriksson2014-06-122-10/+150
|\ \ \ \ \
| * | | | | erts: Fix documentation for no of default allocator instancesSverker Eriksson2014-06-121-10/+4
| * | | | | erts: Add etp-alloc-stats and etp-alloc-instancesSverker Eriksson2014-06-121-1/+147
| |/ / / /
* | | | | Merge branch 'matwey/arm' into maintHenrik Nord2014-06-111-1/+4
|\ \ \ \ \
| * | | | | Add correct detection of powerpc architecture.Matwey V. Kornilov2014-05-311-0/+1
| * | | | | Add correct detection of armv6hl and armv7hl architectures.Matwey V. Kornilov2014-05-311-1/+3
* | | | | | Merge branch 'nox/fix-perms' into maintHenrik Nord2014-06-113-0/+0
|\ \ \ \ \ \
| * | | | | | Fix permissions of some files in the repositoryAnthony Ramine2014-05-253-0/+0
* | | | | | | Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green2014-06-064-23/+31
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Do not use __always_inline__ attribute unless gcc vsn >= 3.1.1Rickard Green2014-05-221-14/+18
| * | | | | | Add ETHR_FORCE_INLINE define to hide compiler specific directivesJani Hakala2014-02-284-10/+14
* | | | | | | Merge branch 'rickard/invalid_bitstr_bifs/OTP-11942' into maintRickard Green2014-06-062-14/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove invalid 'bitstr' exports in erlang.erlRickard Green2014-06-052-14/+2
* | | | | | | | Merge branch 'rickard/binary_to_term_error/OTP-11931' into maintRickard Green2014-06-068-59/+79
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Replace erlang:binary_to_term() Erlang wrappersRickard Green2014-06-058-59/+79
* | | | | | | | Merge branch 'rickard/yielding-binary-list-conversions/OTP-11888' into maintRickard Green2014-06-069-346/+1632
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add test-case comparing old and new implementationsRickard Green2014-05-221-2/+62
| * | | | | | | Make binary BIFs converting from lists yield on large inputRickard Green2014-05-228-342/+1408
| * | | | | | | Make binary BIFs converting to lists yield on large inputRickard Green2014-05-225-10/+170
* | | | | | | | Merge branch 'rickard/disable-gc-fix/OTP-11887' into maintRickard Green2014-06-064-103/+128
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Do not GC other processes in non-smp runtimeRickard Green2014-05-221-37/+0
| * | | | | | Fix conversion of empty string in erts_convert_native_to_filename()Rickard Green2014-05-221-0/+2
| * | | | | | Add support for failing in BIF that has trappedRickard Green2014-05-131-0/+73
| * | | | | | HiPE wrappers for BIFs disabling GCSverker Eriksson2014-05-132-66/+53
* | | | | | | Merge branch 'etsukata/system_info_tolerant_timeofday/OTP-11970' into maintLukas Larsson2014-06-055-1/+18
|\ \ \ \ \ \ \
| * | | | | | | Add erlang:system_info(tolerant_timeofday)Eiichi Tsukata2014-04-285-1/+18
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'lukas/erts/fix_trace_on_registered_procs/OTP-11968' into maintLukas Larsson2014-06-052-1/+28
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | erts: tracing on send now works for registered processesLukas Larsson2014-06-052-1/+28
| |/ / / / /