summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'dgud/emacs/do-not-require-final-newline/PR-1130' into maintDan Gudmundsson2016-10-051-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | erlang-mode: do not configure require-final-newlineTuncer Ayaz2016-07-151-2/+0
* | | | | | | | | | | | Merge branch 'cypherfox/edoc/add_doc/PR-1175' into maintHans Bolinder2016-10-051-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | add info for param and returns tagsLutz Behnke2016-10-041-0/+10
* | | | | | | | | | | | Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maintRaimo Niskanen2016-10-043-4/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | disable RC4 in SSL when crypto doesn't support itAndreas Schultz2016-09-221-0/+3
| * | | | | | | | | | | | Fix compilation when OpenSSL doesn't support RC4Andreas Schultz2016-09-222-3/+24
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maintRaimo Niskanen2016-10-043-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix compilation when OpenSSL doesn't support RC2Magnus Henoch2016-09-143-4/+21
* | | | | | | | | | | | ssl: Correct tests tcp stream handlingIngela Anderton Andin2016-10-041-18/+11
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | ssl: Correct anonymous suite handlingIngela Anderton Andin2016-09-303-31/+26
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'maint-19' into maintIngela Anderton Andin2016-09-296-18/+42
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Update release notesErlang/OTP2016-09-281-0/+25
| * | | | | | | | | Merge branch 'ingela/ssl/prepare-patch' into maint-19Erlang/OTP2016-09-281-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ssl: Prepare for releaseIngela Anderton Andin2016-09-271-1/+1
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'ingela/ssl/ECC-selection-fix/OTP-13918' into maint-19Erlang/OTP2016-09-284-15/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ssl: Correct ECC curve selection, the error could cause default to always be ...Ingela Anderton Andin2016-09-284-15/+4
| | |/ / / / / / / /
| * | | | | | | | | ssl: Avoid event reorderingIngela Anderton Andin2016-09-272-2/+12
| |/ / / / / / / /
* | | | | | | | | Merge branch 'siri/doc-add_pathsa-order/ERL-267/OTP-13920' into maintSiri Hansen2016-09-292-4/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Document the order of directories added with code:add_pathsa/1Siri Hansen2016-09-282-4/+9
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'hasse/parsetools/fix_leex_unicode/OTP-13919' into maintHans Bolinder2016-09-292-5/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | parsetools: Correct handling of Unicode in LeexHans Bolinder2016-09-282-5/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907...Siri Hansen2016-09-281-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Don't report error for shutdown exit tupleMagnus Henoch2016-09-051-0/+4
* | | | | | | | ssh: Update vsn.mkHans Nilsson2016-09-281-1/+1
* | | | | | | | Merge branch 'isvilen/ssh_REPL_exit_status/PR-1173/OTP-13905' into maintHans Nilsson2016-09-282-4/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix SSH custom REPL exit statusSvilen Ivanov2016-09-191-2/+9
| * | | | | | | | Add SSH custom REPL exit status testSvilen Ivanov2016-09-191-2/+31
* | | | | | | | | Merge remote-tracking branch 'github/pr/1183' into maintIngela Anderton Andin2016-09-281-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typos in public_key_app.xmlMagnus Henoch2016-09-271-2/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ahmedshafeeq/inets-httpc-RFC-7231/PR-1172/OTP-13902' into maintIngela Anderton Andin2016-09-282-32/+38
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Update test case docs with RFC-7231Ahmed Shafeeq Bin Mohd Shariff2016-09-271-13/+16
| * | | | | | | | Update behavior of httpc:request to match RFC-7231Ahmed Shafeeq Bin Mohd Shariff2016-09-182-19/+22
| |/ / / / / / /
* | | | | | | | Merge branch 'andrey/stdlib/fix_edlin_expand/ERL-1152' into maintHans Bolinder2016-09-272-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | stdlib: Add a testcase for Unicode expanderHans Bolinder2016-09-231-2/+9
| * | | | | | | | Support for unicode expanderAndrey Teplyashin2016-08-301-1/+1
* | | | | | | | | Merge branch 'siri/ttb/ip-client-queue-size/OTP-13829' into maintSiri Hansen2016-09-274-4/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ttb] Add option <c>queue_size</c> to tracer/2Siri Hansen2016-09-234-4/+25
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'siri/appups-19.1/OTP-13912' into maintSiri Hansen2016-09-272-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update appups in kernel and stdlib for OTP versions > 19.1Siri Hansen2016-09-262-4/+4
| |/ / / / / / / /
* | | | | | | | | Fix typo in documentation for ct_telnet:expect/3Siri Hansen2016-09-261-1/+1
|/ / / / / / / /
* | | | | | | | file_SUITE: Test file:write_file/3Björn Gustavsson2016-09-221-23/+31
| |_|_|/ / / / |/| | | | | |
* | | | | | | Prepare releaseErlang/OTP2016-09-2057-33/+902
* | | | | | | Merge branch 'raimo/diffserv-socket-option/OTP-13582' into maintRaimo Niskanen2016-09-154-6/+35
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Tune 'tclass' semanticsRaimo Niskanen2016-09-141-1/+1
| * | | | | | Implement IPV6_TCLASSRaimo Niskanen2016-09-124-6/+35
* | | | | | | Merge branch 'bjorn/erts/on_load/ERL-240/OTP-13893' into maintBjörn Gustavsson2016-09-152-2/+95
|\ \ \ \ \ \ \
| * | | | | | | Don't leak old code when loading a modules with an on_load functionBjörn Gustavsson2016-09-142-2/+95
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'richarl/eunit/fix-asserts/PR-1168/OTP-13892' into maintBjörn Gustavsson2016-09-151-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Ensure asserts are enabled in eunit.hrlRichard Carlsson2016-09-141-1/+3