summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint-20Erlang/OTP2017-06-305-20/+174
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'dgud/stdlib/string-len-compat/OTP-14487' into maint-20Erlang/OTP2017-06-301-5/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix old length usage in stringDan Gudmundsson2017-06-261-5/+5
| | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'rickard/statistics/OTP-14484' into maint-20Erlang/OTP2017-06-305-35/+53
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'hasse/stdlib/fix_proc_lib/PR-1488/OTP-14482' into maint-20Erlang/OTP2017-06-302-7/+40
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | stdlib: Fix bug in proc_libHans Bolinder2017-06-222-7/+25
| | | * | | | | | | | | Support arbitrary crash report in proc_lib.Daniil Fedotov2017-06-222-2/+17
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'lukas/erts/fix_outputv_port_task_cleanup/ERL-428/OTP-14481' int...Erlang/OTP2017-06-304-57/+113
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-port-leak/OTP-13939/ERL-193' into maint-20Erlang/OTP2017-06-302-3/+47
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'maint'Lukas Larsson2017-07-041-21/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'mikpe/erts/escript-dead-code' into maintLukas Larsson2017-07-041-21/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | escript.c: remove dead codeMikael Pettersson2017-07-021-21/+0
* | | | | | | | | | | | | Merge branch 'maint'Siri Hansen2017-07-036-21/+175
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maintSiri Hansen2017-07-035-20/+174
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | [ct_make] Do not use the interactive tool 'c' from ct_makeSiri Hansen2017-06-291-8/+40
| | * | | | | | | | | | | Use current dir as default outdir for c:c/1,2Siri Hansen2017-06-292-3/+52
| | * | | | | | | | | | | [make] Do not use the interactive tool 'c' from makeSiri Hansen2017-06-292-9/+82
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'siri/dbg/faulty-encoding-comment/OTP-14479' into maintSiri Hansen2017-07-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | [dbg] Fix encoding commentSiri Hansen2017-06-291-1/+1
| | |/ / / / / / / / /
* | | | | | | | | | | Merge pull request #1491 from eltex-ecss/e2k_supportLukas Larsson2017-07-032-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Support e2k architectureBoris Bochkarev2017-06-232-1/+2
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2017-07-032-23/+35
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'ingela/cuddle-openssl' into maintIngela Anderton Andin2017-07-032-23/+35
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | ssl: Workaround localhost problemsIngela Anderton Andin2017-06-301-21/+33
| | * | | | | | | | | ssl: Move clause so that it will matchIngela Anderton Andin2017-06-291-2/+2
* | | | | | | | | | | Merge branch 'maint'Björn Gustavsson2017-06-301-12/+12
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Travis CI: Fix the build matrixBjörn Gustavsson2017-06-301-12/+12
* | | | | | | | | | | Merge branch 'maint'Sverker Eriksson2017-06-292-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'sverker/erts/apply-badarg/ERL-432/OTP-14490' into maintSverker Eriksson2017-06-292-1/+15
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | erts: Make apply throw 'badarg' if Args is not a listSverker Eriksson2017-06-272-1/+15
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2017-06-291-3/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ingela/ssl/crl-test-cuddle' into maintIngela Anderton Andin2017-06-291-3/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ssl: Skip test if OpenSSL has problems generating CRLIngela Anderton Andin2017-06-291-3/+9
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'maint'Ingela Anderton Andin2017-06-291-4/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'ingela/ssl/timeout-cuddle' into maintIngela Anderton Andin2017-06-291-4/+9
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ssl: Set rizzo* test timeout high enough for our slowest test machineIngela Anderton Andin2017-06-291-4/+9
* | | | | | | | | | | Merge branch 'bjorn/erts/minor-beam-ops-enhancements'Björn Gustavsson2017-06-282-100/+97
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reduce C code size for bit syntax instructionsBjörn Gustavsson2017-06-282-68/+83
| * | | | | | | | | | | ops.tab: Use combined operandsBjörn Gustavsson2017-06-281-32/+14
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'maint'Björn Gustavsson2017-06-281-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'bjorn/erts/fix-gen-dest' into maintBjörn Gustavsson2017-06-281-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Eliminate potential unsafe use of general destinationBjörn Gustavsson2017-06-261-4/+4
* | | | | | | | | | | | Merge branch 'john/erts/cleanup-dirty-asserts'John Högberg2017-06-281-44/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove noisy and redundant #ifdefsJohn Högberg2017-06-141-43/+25
| * | | | | | | | | | | | Assert that enqueue_later_op must not run on a dirty scheduler.John Högberg2017-06-141-1/+1
* | | | | | | | | | | | | Merge branch 'maint'John Högberg2017-06-2713-94/+249
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'maint-19' into maintJohn Högberg2017-06-2713-94/+249
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Updated OTP versionOTP-19.3.6.1Erlang/OTP2017-06-262-1/+2
| | * | | | | | | | | | | Update release notesErlang/OTP2017-06-261-0/+37
| | * | | | | | | | | | | Update version numbersErlang/OTP2017-06-261-1/+1