summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* inets: Add Profile argument missed by commit fdfda2fab0921d409789174556582db2...Ingela Anderton Andin2016-12-052-1/+8
* Merge branch 'egil/erl_docgen/reformat-docgen-encoding/OTP-13971' into maintBjörn-Egil Dahlberg2016-10-171-1/+10
|\
| * Reformat docgen xml encodingBjörn-Egil Dahlberg2016-10-111-1/+10
* | ssl: Tune timeout for old solaris machineIngela Anderton Andin2016-10-141-0/+10
* | Merge branch 'maint-19' into maintHans Nilsson2016-10-149-26/+244
|\ \
| * | Prepare releaseErlang/OTP2016-10-132-1/+18
| * | ssh: Removed matching of 'ok' after send which could cause error reportsHans Nilsson2016-10-131-24/+26
| * | ssh: ssh_protocol_SUITE test for handling of illegal info_linesHans Nilsson2016-10-131-0/+31
| * | ssh: property test case for illegal infoline and closeHans Nilsson2016-10-135-1/+169
* | | Merge branch 'hasse/dialyzer/fix_opaque_bugs/OTP-13693' into maintHans Bolinder2016-10-1311-57/+17218
|\ \ \
| * | | dialyzer: Fix opaque bugHans Bolinder2016-10-064-45/+262
| * | | dialyzer: Fix opaque bugsHans Bolinder2016-10-068-12/+16956
* | | | Merge branch 'xsipewe/dialyzer/doc_cleanup' into maintHans Bolinder2016-10-125-496/+643
|\ \ \ \
| * | | | Update Dialyzer documentationxsipewe2016-10-115-496/+643
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'github/pr/1199' into maintIngela Anderton Andin2016-10-111-1/+1
|\ \ \ \
| * | | | Correct a typo in mod_esi documentationWill2016-10-101-1/+1
* | | | | Merge branch 'ingela/ssl/algo-check/OTP-13959' into maintIngela Anderton Andin2016-10-111-17/+49
|\ \ \ \ \
| * | | | | Properly filter ssl cipher suites reported as supportedDániel Szoboszlay2016-10-101-17/+49
* | | | | | Merge branch 'ingela/ssl/crl_SUITE' into maintIngela Anderton Andin2016-10-111-37/+55
|\ \ \ \ \ \
| * | | | | | ssl: Make sure test has correct inputIngela Anderton Andin2016-09-211-37/+55
* | | | | | | Merge branch 'maint-19' into maintHans Nilsson2016-10-113-59/+51
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Prepare releaseErlang/OTP2016-10-102-1/+17
| * | | | | Revert "ssh: Add non-blocking send" since it introduces Error ReportsHans Nilsson2016-10-101-58/+34
* | | | | | Merge branch 'sverker/load_nif-print-init-error/OTP-13951' into maintSverker Eriksson2016-10-101-18/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | crypto: Return source line number from failed load/upgradeSverker Eriksson2016-10-051-18/+21
* | | | | | Merge branch 'bjorn/compiler/beam_bsm/ERL-268/OTP-13947' into maintBjörn Gustavsson2016-10-072-11/+46
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | beam_bsm: Eliminate unsafe optimizationBjörn Gustavsson2016-10-062-11/+46
* | | | | | Merge branch 'ingela/inets/httpc/ERL-253' into maintIngela Anderton Andin2016-10-071-2/+5
|\ \ \ \ \ \
| * | | | | | inets: httpc improve error handlingIngela Anderton Andin2016-09-191-2/+5
* | | | | | | Merge branch 'kostis/inets-reference-record-types/PR-1188' into maintIngela Anderton Andin2016-10-076-98/+58
|\ \ \ \ \ \ \
| * | | | | | | Replace ref() with reference() in inets filesKostis Sagonas2016-10-046-98/+58
* | | | | | | | Merge branch 'ingela/ssl/cipher-type-spec' into maintIngela Anderton Andin2016-10-072-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | ssl: Adjust cipher type to conform to implementationIngela Anderton Andin2016-10-052-3/+3
* | | | | | | | | Merge branch 'dgud/wx/fix-unicode-chardata/ERL-270/OTP-13934' into maintDan Gudmundsson2016-10-0782-391/+393
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix guard test for chardataDan Gudmundsson2016-10-0582-391/+393
* | | | | | | | | | Merge branch 'dgud/mnesia/dirty_select_cont/PR-1184/OTP-13944' into maintDan Gudmundsson2016-10-072-3/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow reusing mnesia select continuationsDániel Szoboszlay2016-10-062-3/+15
* | | | | | | | | | | Merge branch 'dgud/tools/emacs/edoc-support/PR-1195/OTP-13945' into maintDan Gudmundsson2016-10-074-0/+179
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | New file erlang-edoc.el to support EDoc in erlang-modeLeo Liu2016-10-064-0/+179
* | | | | | | | | | | Merge branch 'maint-19' into maintIngela Anderton Andin2016-10-063-1/+28
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Update release notesErlang/OTP2016-10-061-0/+18
| * | | | | | | | | ssh: Prepare releaseIngela Anderton Andin2016-10-052-1/+5
| * | | | | | | | | ssh: Handle gen_server:call/3 exits properlyIngela Anderton Andin2016-10-051-1/+6
* | | | | | | | | | Merge branch 'hasse/parsetools/fix_leex_counting/ERL-263/OTP-13916' into maintHans Bolinder2016-10-053-13/+68
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | parsetools: Correct counting of newlinesHans Bolinder2016-09-293-13/+68
* | | | | | | | | | Merge branch 'dgud/wx/drop-files/OTP-13933' into maintDan Gudmundsson2016-10-0590-11891/+12242
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | wx: add wxWindowDragAcceptFilesDan Gudmundsson2016-09-2983-11675/+11870
| * | | | | | | | | | wx: Add simple dropfiles supportDan Gudmundsson2016-09-2812-226/+382
* | | | | | | | | | | Merge branch 'bjorn/compiler/beam_block/ERL-266/OTP-13931' into maintBjörn Gustavsson2016-10-055-22/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | beam_block: Avoid unsafe inclusion of get_map_elements in blocksBjörn Gustavsson2016-10-055-22/+30
View Lorry Controller Status