summaryrefslogtreecommitdiff
path: root/erts/etc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sverk/literal-alloc-polish'Sverker Eriksson2016-03-081-0/+2
|\
| * erts: Add emulator flag +MIscs for literal super carrier sizeSverker Eriksson2016-02-231-0/+1
| * erts: Make literal_alloc documented and configurableSverker Eriksson2016-02-231-0/+1
* | Merge branch 'maint'Björn-Egil Dahlberg2016-02-251-4/+0
|\ \
| * \ Merge branch 'egil/heart-callback/OTP-13250' into maintBjörn-Egil Dahlberg2016-02-251-4/+0
| |\ \
| | * | heart: Remove dead codeBjörn-Egil Dahlberg2016-02-161-4/+0
* | | | Merge branch 'maint'Henrik Nord2016-02-182-2/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix typo in Windows build scriptsMichael Santos2016-01-202-2/+2
| |/
* | Merge branch 'maint'Henrik Nord2015-12-185-11/+111
|\ \ | |/
| * Revert "Fix erroneous splitting of emulator path"Björn-Egil Dahlberg2015-12-175-11/+111
* | Merge branch 'rickard/ohmq-fixup/OTP-13047'Rickard Green2015-12-081-1/+1
|\ \
| * | Replace off_heap_message_queue option with message_queue_data optionRickard Green2015-12-081-1/+1
* | | Merge branch 'maint'Sverker Eriksson2015-11-271-0/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'sverk/cpool_fetch-dc_list-fix' into maintSverker Eriksson2015-11-271-0/+1
| |\ \
| | * | erts: Add TEST allocatorSverker Eriksson2015-11-101-0/+1
* | | | Merge branch 'maint'Zandra2015-11-171-2/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'legoscia/heart-remove-obsolete-comment' into maintZandra2015-11-171-2/+0
| |\ \ \
| | * | | Remove obsolete comment in heart.cMagnus Henoch2015-11-111-2/+0
* | | | | Merge branch 'maint'Zandra2015-11-175-111/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'evnu/fix-whitespace-splitting' into maintZandra2015-11-175-111/+11
| |\ \ \ \
| | * | | | Fix erroneous splitting of emulator pathMagnus Ottenklinger2015-10-025-111/+11
| | | |/ / | | |/| |
* | | | | Merge branch 'maint'Henrik Nord2015-11-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch 'legoscia/erl-make-exit-code' into maintHenrik Nord2015-11-161-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Make erl -make return non-zero exit code on failureMagnus Henoch2015-10-261-1/+1
* | | | Merge branch 'rickard/ohmq/OTP-13047'Rickard Green2015-11-121-1/+21
|\ \ \ \
| * | | | Fragmented young heap generation and off_heap_message_queue optionRickard Green2015-11-121-1/+21
* | | | | Merge branch 'maint'Henrik Nord2015-11-021-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'henrik/find-redist' into maintHenrik Nord2015-11-021-1/+1
| |\ \ \ \
| | * | | | add path to vcredist.exe for VS-2013Henrik Nord2015-10-161-1/+1
| | | |_|/ | | |/| |
* | | | | Merge branch 'maint'Dan Gudmundsson2015-10-275-6/+29
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | erts: Detect and build on MSYS2 for windowsDan Gudmundsson2015-10-225-6/+29
| |/ /
* | | ose: Remove all code related to the OSE portLukas Larsson2015-07-1014-2454/+1192
* | | erts: Remove halfword etp-commandsBjörn-Egil Dahlberg2015-06-241-11/+5
|/ /
* | Change license text to APLv2Bruce Yinhe2015-06-1898-955/+1053
* | Merge branch 'rickard/+zebwt/OTP-12830'Rickard Green2015-06-151-0/+1
|\ \
| * | ETS busy wait optionRickard Green2015-06-151-0/+1
* | | Merge branch 'sverk/map-merge-trap'Sverker Eriksson2015-06-151-1/+1
|\ \ \
| * | | erts: Fix typo in etp-carrier-blocksSverker Eriksson2015-05-181-1/+1
* | | | Merge branch 'rickard/delayed-delete-node/OTP-12802'Rickard Green2015-06-101-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Delayed node table GCRickard Green2015-06-101-0/+1
| |/ /
* | | Merge branch 'richcarl/warnings-by-default/OTP-12781'Björn-Egil Dahlberg2015-05-281-1/+1
|\ \ \
| * | | Map error logger warnings to warning messages by defaultRichard Carlsson2015-05-221-1/+1
* | | | Correct usage of sizeof() for pointer typesJesper Louis Andersen2015-05-121-1/+1
| |/ / |/| |
* | | Merge branch 'maint'Zandra Hird2015-05-061-1/+1
|\ \ \ | | |/ | |/|
| * | Get the VTS mode working with private CT version of webtoolPeter Andersson2015-05-041-1/+1
| * | erts: Enable command line argument for initial pd sizeBjörn-Egil Dahlberg2015-03-251-0/+1
* | | Fix cross compilation for AndroidJérôme de Bretagne2015-04-271-0/+4
* | | Merge branch 'egil/core-on-heart-tmo/OTP-12613'Björn-Egil Dahlberg2015-04-241-8/+17
|\ \ \
| * | | erts: Enable different abort signal from heartBjörn-Egil Dahlberg2015-04-201-8/+17
| | |/ | |/|
* | | erts: Add map support to gdb etp commandSverker Eriksson2015-04-141-1/+56