Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | Merge branch 'dgud/emacs/do-not-require-final-newline/PR-1130' into maint | Dan Gudmundsson | 2016-10-05 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | erlang-mode: do not configure require-final-newline | Tuncer Ayaz | 2016-07-15 | 1 | -2/+0 | |
* | | | | | | | | | | | | Merge branch 'cypherfox/edoc/add_doc/PR-1175' into maint | Hans Bolinder | 2016-10-05 | 1 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | add info for param and returns tags | Lutz Behnke | 2016-10-04 | 1 | -0/+10 | |
* | | | | | | | | | | | | Merge branch 'RoadRunnr/crypto/no-rc4/PR-1169/OTP-13896' into maint | Raimo Niskanen | 2016-10-04 | 3 | -4/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | disable RC4 in SSL when crypto doesn't support it | Andreas Schultz | 2016-09-22 | 1 | -0/+3 | |
| * | | | | | | | | | | | | Fix compilation when OpenSSL doesn't support RC4 | Andreas Schultz | 2016-09-22 | 2 | -3/+24 | |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'legoscia/crypto/no-rc2/PR-1163/OTP-13895' into maint | Raimo Niskanen | 2016-10-04 | 3 | -4/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix compilation when OpenSSL doesn't support RC2 | Magnus Henoch | 2016-09-14 | 3 | -4/+21 | |
* | | | | | | | | | | | | ssl: Correct tests tcp stream handling | Ingela Anderton Andin | 2016-10-04 | 1 | -18/+11 | |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | ssl: Correct anonymous suite handling | Ingela Anderton Andin | 2016-09-30 | 3 | -31/+26 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'maint-19' into maint | Ingela Anderton Andin | 2016-09-29 | 6 | -18/+42 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Update release notes | Erlang/OTP | 2016-09-28 | 1 | -0/+25 | |
| * | | | | | | | | | Merge branch 'ingela/ssl/prepare-patch' into maint-19 | Erlang/OTP | 2016-09-28 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | ssl: Prepare for release | Ingela Anderton Andin | 2016-09-27 | 1 | -1/+1 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'ingela/ssl/ECC-selection-fix/OTP-13918' into maint-19 | Erlang/OTP | 2016-09-28 | 4 | -15/+4 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | ssl: Correct ECC curve selection, the error could cause default to always be ... | Ingela Anderton Andin | 2016-09-28 | 4 | -15/+4 | |
| | |/ / / / / / / / | ||||||
| * | | | | | | | | | ssl: Avoid event reordering | Ingela Anderton Andin | 2016-09-27 | 2 | -2/+12 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'siri/doc-add_pathsa-order/ERL-267/OTP-13920' into maint | Siri Hansen | 2016-09-29 | 2 | -4/+9 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | Document the order of directories added with code:add_pathsa/1 | Siri Hansen | 2016-09-28 | 2 | -4/+9 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'hasse/parsetools/fix_leex_unicode/OTP-13919' into maint | Hans Bolinder | 2016-09-29 | 2 | -5/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | parsetools: Correct handling of Unicode in Leex | Hans Bolinder | 2016-09-28 | 2 | -5/+7 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'legoscia/dynamic-child-shutdown-tuple/ERL-163/PR-1158/OTP-13907... | Siri Hansen | 2016-09-28 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't report error for shutdown exit tuple | Magnus Henoch | 2016-09-05 | 1 | -0/+4 | |
* | | | | | | | | ssh: Update vsn.mk | Hans Nilsson | 2016-09-28 | 1 | -1/+1 | |
* | | | | | | | | Merge branch 'isvilen/ssh_REPL_exit_status/PR-1173/OTP-13905' into maint | Hans Nilsson | 2016-09-28 | 2 | -4/+40 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix SSH custom REPL exit status | Svilen Ivanov | 2016-09-19 | 1 | -2/+9 | |
| * | | | | | | | | Add SSH custom REPL exit status test | Svilen Ivanov | 2016-09-19 | 1 | -2/+31 | |
* | | | | | | | | | Merge remote-tracking branch 'github/pr/1183' into maint | Ingela Anderton Andin | 2016-09-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix typos in public_key_app.xml | Magnus Henoch | 2016-09-27 | 1 | -2/+2 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ahmedshafeeq/inets-httpc-RFC-7231/PR-1172/OTP-13902' into maint | Ingela Anderton Andin | 2016-09-28 | 2 | -32/+38 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update test case docs with RFC-7231 | Ahmed Shafeeq Bin Mohd Shariff | 2016-09-27 | 1 | -13/+16 | |
| * | | | | | | | | Update behavior of httpc:request to match RFC-7231 | Ahmed Shafeeq Bin Mohd Shariff | 2016-09-18 | 2 | -19/+22 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'andrey/stdlib/fix_edlin_expand/ERL-1152' into maint | Hans Bolinder | 2016-09-27 | 2 | -3/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | stdlib: Add a testcase for Unicode expander | Hans Bolinder | 2016-09-23 | 1 | -2/+9 | |
| * | | | | | | | | Support for unicode expander | Andrey Teplyashin | 2016-08-30 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'siri/ttb/ip-client-queue-size/OTP-13829' into maint | Siri Hansen | 2016-09-27 | 4 | -4/+25 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | [ttb] Add option <c>queue_size</c> to tracer/2 | Siri Hansen | 2016-09-23 | 4 | -4/+25 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'siri/appups-19.1/OTP-13912' into maint | Siri Hansen | 2016-09-27 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update appups in kernel and stdlib for OTP versions > 19.1 | Siri Hansen | 2016-09-26 | 2 | -4/+4 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Fix typo in documentation for ct_telnet:expect/3 | Siri Hansen | 2016-09-26 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | file_SUITE: Test file:write_file/3 | Björn Gustavsson | 2016-09-22 | 1 | -23/+31 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | Prepare release | Erlang/OTP | 2016-09-20 | 57 | -33/+902 | |
* | | | | | | | Merge branch 'raimo/diffserv-socket-option/OTP-13582' into maint | Raimo Niskanen | 2016-09-15 | 4 | -6/+35 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Tune 'tclass' semantics | Raimo Niskanen | 2016-09-14 | 1 | -1/+1 | |
| * | | | | | | Implement IPV6_TCLASS | Raimo Niskanen | 2016-09-12 | 4 | -6/+35 | |
* | | | | | | | Merge branch 'bjorn/erts/on_load/ERL-240/OTP-13893' into maint | Björn Gustavsson | 2016-09-15 | 2 | -2/+95 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Don't leak old code when loading a modules with an on_load function | Björn Gustavsson | 2016-09-14 | 2 | -2/+95 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'richarl/eunit/fix-asserts/PR-1168/OTP-13892' into maint | Björn Gustavsson | 2016-09-15 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Ensure asserts are enabled in eunit.hrl | Richard Carlsson | 2016-09-14 | 1 | -1/+3 |