summaryrefslogtreecommitdiff
path: root/erts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'nybek/fix_gen_tcp_shutdown'Zandra Hird2015-06-022-23/+56
|\
| * Fix gen_tcp:shutdown/2 by making it asynchronousRory Byrne2015-05-122-23/+56
* | Merge branch 'vinoski/enif-raise-exception/OTP-12770'Sverker Eriksson2015-06-015-67/+164
|\ \
| * | Add enif_raise_exceptionSteve Vinoski2015-05-265-50/+123
| * | Enhance enif_has_pending_exceptionSteve Vinoski2015-05-265-21/+41
| * | Fix for enif_schedule_nif and exceptionsSteve Vinoski2015-05-262-3/+7
* | | Merge branch 'sverk/nif-map-docs'Sverker Eriksson2015-06-014-50/+167
|\ \ \
| * | | erts: Cleanup fsummary lines in erl_nif docsSverker Eriksson2015-05-281-32/+32
| * | | erts: Fix alphabetic order in erl_nif docSverker Eriksson2015-05-281-8/+8
| * | | erts: Add docs for map functions in nif APISverker Eriksson2015-05-281-8/+121
| * | | erts: Rename ErlNifMapIteratorEntry enumsSverker Eriksson2015-05-273-8/+12
| |/ /
* | | Merge branch 'legoscia/dialyzer/cache-hipe-binaries/OTP-12779'Björn Gustavsson2015-05-293-7/+4
|\ \ \
| * | | Change hipe_bifs:system_crc/1 to hipe_bifs:system_crc/0Magnus Henoch2015-05-273-7/+4
* | | | Merge branch 'richcarl/warnings-by-default/OTP-12781'Björn-Egil Dahlberg2015-05-283-9/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Map error logger warnings to warning messages by defaultRichard Carlsson2015-05-223-9/+11
* | | | Merge branch 'egil/cuddle-tests'Björn-Egil Dahlberg2015-05-261-92/+80
|\ \ \ \
| * | | | erts: Relax monitor_SUITE:mixer/1Björn-Egil Dahlberg2015-05-251-2/+1
| * | | | erts: Refactor monitor_SUITE:mixer/1Björn-Egil Dahlberg2015-05-251-92/+81
* | | | | Merge branch 'jlouis/cocci-noderef-fixes'Henrik Nord2015-05-262-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Correct usage of sizeof() for pointer typesJesper Louis Andersen2015-05-122-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'vinoski/ds-timer-wheel-fix'Rickard Green2015-05-251-57/+92
|\ \ \ \
| * | | | Avoid timer wheel work in dirty schedulersSteve Vinoski2015-05-181-57/+92
* | | | | Merge branch 'rickard/timer-improvement/OTP-12650'Rickard Green2015-05-252-170/+190
|\ \ \ \ \
| * | | | | Fix bug causing timeout to overwrite exit instructionRickard Green2015-05-251-1/+1
| * | | | | Doc fixesRickard Green2015-05-251-169/+189
* | | | | | Merge branch 'rickard/fix_alloc_stat_fix/OTP-12766'Rickard Green2015-05-251-19/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix statistics reported about fix alloc typesRickard Green2015-05-251-19/+42
* | | | | | Merge branch 'bk/configure-arch-ppc64le/OTP-12761'Björn-Egil Dahlberg2015-05-221-0/+1
|\ \ \ \ \ \
| * | | | | | Add architecture ppc64le architecture as a ppc64Breno Leitao2015-05-211-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Update runtime dependenciesRickard Green2015-05-211-1/+1
|/ / / / /
* | | | | Revert "Map error logger warnings to warning messages by default"Zandra Hird2015-05-203-11/+9
* | | | | Merge branch 'richcarl/warnings-by-default'Zandra Hird2015-05-203-9/+11
|\ \ \ \ \
| * | | | | Map error logger warnings to warning messages by defaultRichard Carlsson2015-05-183-9/+11
| | |/ / / | |/| | |
* | | | | Merge branch 'mikpe/erl_child_setup-android-breakage'Henrik Nord2015-05-201-7/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | erl_child_setup.c: fix Android breakageMikael Pettersson2015-04-281-7/+9
* | | | | Revert "Prepare release"Henrik Nord2015-05-131-502/+0
| |/ / / |/| | |
* | | | Prepare releaseErlang/OTP2015-05-121-0/+502
* | | | Update preloaded modulesRickard Green2015-05-1210-0/+0
* | | | Merge branch 'rickard/timer-optimization/OTP-12650'Rickard Green2015-05-129-181/+657
|\ \ \ \
| * | | | Timer fixes, documentation, and test casesRickard Green2015-05-129-181/+657
* | | | | Merge branch 'jv/18/emulator-send-to-error_logger/OTP-12735'Björn-Egil Dahlberg2015-05-123-64/+157
|\ \ \ \ \
| * | | | | erts: Fix erts_send_error_term_to_logger memory leakBjörn-Egil Dahlberg2015-05-121-1/+4
| * | | | | Send format and args on process exit to error_loggerJosé Valim2015-05-111-5/+22
| * | | | | Add erts_send_error_term_to_loggerJosé Valim2015-05-112-59/+132
* | | | | | Merge branch 'egil/erts/high_accuracy_sleep/OTP-12236'Björn-Egil Dahlberg2015-05-113-9/+167
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | erts: Add high accuracy poll timeoutsLukas Larsson2015-04-133-9/+167
* | | | | | Merge branch 'egil/fix-maps-copy-shallow'Björn-Egil Dahlberg2015-05-115-12/+42
|\ \ \ \ \ \
| * | | | | | erts: Make hashmap_get halfword safeBjörn-Egil Dahlberg2015-05-082-5/+4
| * | | | | | erts: Fix ETS db_has_variable check for large MapsBjörn-Egil Dahlberg2015-05-071-0/+5
| * | | | | | erts: Fix copy shallow for large MapsBjörn-Egil Dahlberg2015-05-071-6/+0