summaryrefslogtreecommitdiff
path: root/erts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'henrik/epmd-ctime' into maintHenrik Nord2015-11-111-1/+1
|\
| * add missing time.hHenrik Nord2015-11-041-1/+1
* | Merge branch 'gomoripeti/tracedoc_fix' into maintHenrik Nord2015-11-111-1/+1
|\ \
| * | Fix typo in trace gc_start docPéter Gömöri2015-11-031-1/+1
* | | Fix typos and grammarDerek Brown2015-11-042-17/+17
| |/ |/|
* | [erts] Correct documentationHans Bolinder2015-11-0411-141/+148
|/
* Merge branch 'lukas/erts/win32_bool_fix/OTP-13079' into maintLukas Larsson2015-11-022-6/+6
|\
| * erts: bool is a reserved word, use boolean insteadLukas Larsson2015-08-252-6/+6
* | Merge branch 'lukas/erts/process_mem_test_fix/OTP-13077' into maintLukas Larsson2015-11-021-1/+9
|\ \
| * | erts: Don't run processes tests on lcnt with little memoryLukas Larsson2015-10-121-1/+9
* | | 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 'lrascao/fix/build_fail_on_enabled_dist_debug' into maintHenrik Nord2015-10-271-7/+11
|\ \ \ \
| * | | | Fix build fail when enabling distribution debug messagesLuis Rascao2015-10-051-7/+11
| |/ / /
* | | | Merge branch 'lucafavatella/dialyzer-fun-literal-arity' into maintHenrik Nord2015-10-271-0/+1
|\ \ \ \
| * | | | Teach Dialyzer arity of funs with literal arityLuca Favatella2015-07-111-0/+1
* | | | | Merge branch 'dgud/msys2-fixes' into maintDan Gudmundsson2015-10-275-6/+29
|\ \ \ \ \
| * | | | | erts: Detect and build on MSYS2 for windowsDan Gudmundsson2015-10-225-6/+29
| | |/ / / | |/| | |
* | | | | erts: Clarify documentationIngela Anderton Andin2015-10-261-7/+7
* | | | | erts: Add {line_delimiter, byte()} option to inet:setopts/2Serge Aleynikov2015-10-268-6/+31
* | | | | Merge branch 'kostis/hipe-native-bif-warning' into maintHenrik Nord2015-10-131-3/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Take out unused code that results in a gcc warningKostis Sagonas2015-08-201-3/+0
* | | | | Merge branch 'sverk/erts/doc-review' into maintSverker Eriksson2015-10-063-3773/+4289
|\ \ \ \ \
| * | | | | erts: Spell-check erlang.xmlSverker Eriksson2015-10-051-32/+31
| * | | | | erts: Review newer additions to erlang.xmlSverker Eriksson2015-10-011-138/+136
| * | | | | erts: Review module erlang docsSverker Eriksson2015-10-012-234/+223
| * | | | | erts: Update module erlang docsxsipewe2015-10-011-3194/+3702
| * | | | | erts: Review time correction docsSverker Eriksson2015-10-011-9/+9
| * | | | | erts: Update erts time correction docsxsipewe2015-10-011-371/+393
| | |/ / / | |/| | |
* | | | | Merge branch 'lukas/erts/fix_ptab_assert/OTP-13028' into maintLukas Larsson2015-10-051-6/+0
|\ \ \ \ \
| * | | | | erts: Remove assertion that ptab is emptyLukas Larsson2015-09-281-6/+0
| |/ / / /
* | | | | Merge branch 'essen/missing-behavior-absform' into maintZandra2015-10-021-0/+4
|\ \ \ \ \
| * | | | | Add missing behavior/behaviours to absform docsLoïc Hoguin2015-08-281-0/+4
| | |/ / / | |/| | |
* | | | | Merge branch 'maint-17' into maintHenrik Nord2015-10-011-0/+8
|\ \ \ \ \
| * | | | | Prepare releaseErlang/OTP2015-09-072-1/+18
| * | | | | Merge branch 'sverk/trace-process_dump-matchstate-17/OTP-12968' into maint-17Erlang/OTP2015-09-076-31/+54
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'c-rack/fix-list_to_bitstring-example' into maintHenrik Nord2015-09-301-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Typos in documentation example of list_to_bitstring/1Constantin Rack2015-09-151-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Prepare releaseErlang/OTP2015-09-212-1/+124
* | | | | | Merge branch 'lukas/erts/ttsl_eintr/OTP-12987' into maintRickard Green2015-09-171-7/+8
|\ \ \ \ \ \
| * | | | | | erts: Make sure to deal with EINTR write failuresLukas Larsson2015-09-161-7/+8
* | | | | | | Exclude ose application from upgrade testSiri Hansen2015-09-171-1/+1
* | | | | | | Merge branch 'goertzenator/enif_make_pid-unused_param' into maintHenrik Nord2015-09-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix unused parameter warning in enif_make_pidDaniel Goertzen2015-08-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mikpe/erts-binary_to_integer-fix' into maintHenrik Nord2015-09-172-1/+4
|\ \ \ \ \ \ \
| * | | | | | | erts: fix binary_to_integer boundary caseMikael Pettersson2015-07-312-1/+4
| |/ / / / / /
* | | | | | | Merge branch 'sverk/inet-packet-ssl_tls-passive' into maintSverker Eriksson2015-09-101-3/+3
|\ \ \ \ \ \ \
| * | | | | | | erts: Fix inet packet mode ssl_tls for passive modeSverker Eriksson2015-09-071-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'rickard/disable-saved-compile-time/OTP-12971' into maintRickard Green2015-09-095-3/+24
|\ \ \ \ \ \ \
| * | | | | | | Add configure switch --disable-saved-compile-timeRickard Green2015-09-095-3/+24
| |/ / / / / /