Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint-20 | Erlang/OTP | 2017-06-30 | 5 | -20/+174 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'dgud/stdlib/string-len-compat/OTP-14487' into maint-20 | Erlang/OTP | 2017-06-30 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Fix old length usage in string | Dan Gudmundsson | 2017-06-26 | 1 | -5/+5 | |
| | | | |_|_|/ / / / | | | |/| | | | | | | ||||||
| | * | | | | | | | | Merge branch 'rickard/statistics/OTP-14484' into maint-20 | Erlang/OTP | 2017-06-30 | 5 | -35/+53 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'hasse/stdlib/fix_proc_lib/PR-1488/OTP-14482' into maint-20 | Erlang/OTP | 2017-06-30 | 2 | -7/+40 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | stdlib: Fix bug in proc_lib | Hans Bolinder | 2017-06-22 | 2 | -7/+25 | |
| | | * | | | | | | | | | Support arbitrary crash report in proc_lib. | Daniil Fedotov | 2017-06-22 | 2 | -2/+17 | |
| | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'lukas/erts/fix_outputv_port_task_cleanup/ERL-428/OTP-14481' int... | Erlang/OTP | 2017-06-30 | 4 | -57/+113 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'john/erts/fix-port-leak/OTP-13939/ERL-193' into maint-20 | Erlang/OTP | 2017-06-30 | 2 | -3/+47 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'maint' | Lukas Larsson | 2017-07-04 | 1 | -21/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge branch 'mikpe/erts/escript-dead-code' into maint | Lukas Larsson | 2017-07-04 | 1 | -21/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | escript.c: remove dead code | Mikael Pettersson | 2017-07-02 | 1 | -21/+0 | |
* | | | | | | | | | | | | | Merge branch 'maint' | Siri Hansen | 2017-07-03 | 6 | -21/+175 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint | Siri Hansen | 2017-07-03 | 5 | -20/+174 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | [ct_make] Do not use the interactive tool 'c' from ct_make | Siri Hansen | 2017-06-29 | 1 | -8/+40 | |
| | * | | | | | | | | | | | Use current dir as default outdir for c:c/1,2 | Siri Hansen | 2017-06-29 | 2 | -3/+52 | |
| | * | | | | | | | | | | | [make] Do not use the interactive tool 'c' from make | Siri Hansen | 2017-06-29 | 2 | -9/+82 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'siri/dbg/faulty-encoding-comment/OTP-14479' into maint | Siri Hansen | 2017-07-03 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | [dbg] Fix encoding comment | Siri Hansen | 2017-06-29 | 1 | -1/+1 | |
| | |/ / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #1491 from eltex-ecss/e2k_support | Lukas Larsson | 2017-07-03 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Support e2k architecture | Boris Bochkarev | 2017-06-23 | 2 | -1/+2 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'maint' | Ingela Anderton Andin | 2017-07-03 | 2 | -23/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'ingela/cuddle-openssl' into maint | Ingela Anderton Andin | 2017-07-03 | 2 | -23/+35 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | ssl: Workaround localhost problems | Ingela Anderton Andin | 2017-06-30 | 1 | -21/+33 | |
| | * | | | | | | | | | ssl: Move clause so that it will match | Ingela Anderton Andin | 2017-06-29 | 1 | -2/+2 | |
* | | | | | | | | | | | Merge branch 'maint' | Björn Gustavsson | 2017-06-30 | 1 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Travis CI: Fix the build matrix | Björn Gustavsson | 2017-06-30 | 1 | -12/+12 | |
* | | | | | | | | | | | Merge branch 'maint' | Sverker Eriksson | 2017-06-29 | 2 | -1/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge branch 'sverker/erts/apply-badarg/ERL-432/OTP-14490' into maint | Sverker Eriksson | 2017-06-29 | 2 | -1/+15 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | erts: Make apply throw 'badarg' if Args is not a list | Sverker Eriksson | 2017-06-27 | 2 | -1/+15 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'maint' | Ingela Anderton Andin | 2017-06-29 | 1 | -3/+9 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'ingela/ssl/crl-test-cuddle' into maint | Ingela Anderton Andin | 2017-06-29 | 1 | -3/+9 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | ssl: Skip test if OpenSSL has problems generating CRL | Ingela Anderton Andin | 2017-06-29 | 1 | -3/+9 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'maint' | Ingela Anderton Andin | 2017-06-29 | 1 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'ingela/ssl/timeout-cuddle' into maint | Ingela Anderton Andin | 2017-06-29 | 1 | -4/+9 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | ssl: Set rizzo* test timeout high enough for our slowest test machine | Ingela Anderton Andin | 2017-06-29 | 1 | -4/+9 | |
* | | | | | | | | | | | Merge branch 'bjorn/erts/minor-beam-ops-enhancements' | Björn Gustavsson | 2017-06-28 | 2 | -100/+97 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Reduce C code size for bit syntax instructions | Björn Gustavsson | 2017-06-28 | 2 | -68/+83 | |
| * | | | | | | | | | | | ops.tab: Use combined operands | Björn Gustavsson | 2017-06-28 | 1 | -32/+14 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'maint' | Björn Gustavsson | 2017-06-28 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge branch 'bjorn/erts/fix-gen-dest' into maint | Björn Gustavsson | 2017-06-28 | 1 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Eliminate potential unsafe use of general destination | Björn Gustavsson | 2017-06-26 | 1 | -4/+4 | |
* | | | | | | | | | | | | Merge branch 'john/erts/cleanup-dirty-asserts' | John Högberg | 2017-06-28 | 1 | -44/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove noisy and redundant #ifdefs | John Högberg | 2017-06-14 | 1 | -43/+25 | |
| * | | | | | | | | | | | | Assert that enqueue_later_op must not run on a dirty scheduler. | John Högberg | 2017-06-14 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'maint' | John Högberg | 2017-06-27 | 13 | -94/+249 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'maint-19' into maint | John Högberg | 2017-06-27 | 13 | -94/+249 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Updated OTP versionOTP-19.3.6.1 | Erlang/OTP | 2017-06-26 | 2 | -1/+2 | |
| | * | | | | | | | | | | | Update release notes | Erlang/OTP | 2017-06-26 | 1 | -0/+37 | |
| | * | | | | | | | | | | | Update version numbers | Erlang/OTP | 2017-06-26 | 1 | -1/+1 |