summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-18.3.3Erlang/OTP2016-05-032-1/+2
* Prepare releaseErlang/OTP2016-05-035-3/+100
* Merge branch 'ingela/inets/deprecated-inets_regexp/OTP-13533' into maint-18Erlang/OTP2016-05-035-8/+418
|\
| * inets: Prepare for releaseIngela Anderton Andin2016-05-032-7/+1
| * inets: Put back inets_regexp module in OTP 18Ingela Anderton Andin2016-05-033-1/+417
* | Merge branch 'ingela/ssl/maint/algo-fixes/OTP-13525' into maint-18Erlang/OTP2016-05-033-11/+21
|\ \
| * | ssl: Correct guard expressionIngela Anderton Andin2016-04-291-2/+3
| * | ssl: Correct cipher suites conversionIngela Anderton Andin2016-04-292-9/+18
| |/
* | Merge branch 'peppe/ct_misc_18_patches' into maint-18Erlang/OTP2016-05-0322-145/+359
|\ \
| * | Add flag/option for disabling the character escaping functionalityPeter Andersson2016-05-0211-21/+114
| * | Fix bug using the wrong lists search functionPeter Andersson2016-05-021-1/+1
| * | Fix bug with clashing timestamp valuesPeter Andersson2016-05-024-52/+69
| * | Fix problem with stylesheet tags getting escapedPeter Andersson2016-05-021-19/+27
| * | Skip pre/post test IO suite if cover or debug is runningPeter Andersson2016-05-024-21/+42
| * | Tweak pre_post_io test case to run without failingPeter Andersson2016-05-023-27/+76
| * | Fix various log related problemsPeter Andersson2016-05-023-6/+32
| |/
* | Merge branch 'peppe/ct_remove_nodelay/OTP-13462' into maint-18Erlang/OTP2016-05-035-26/+61
|\ \
| * | Update the reference manualPeter Andersson2016-05-023-3/+7
| * | Make the nodelay setting configurable and false per defaultPeter Andersson2016-04-283-24/+55
* | | Merge branch 'zandra/cth_surefire-bug/OTP-13513' into maint-18Erlang/OTP2016-05-035-23/+192
|\ \ \ | |_|/ |/| |
| * | add testcase for the surefire hook bugZandra2016-04-274-22/+190
| * | fix cht_surefire bug when pre_init_per_suite failsZandra2016-04-271-1/+2
|/ /
* | Updated OTP versionOTP-18.3.2Erlang/OTP2016-04-262-1/+2
* | Update release notesErlang/OTP2016-04-262-1/+46
* | Merge branch 'ingela/inets/http_server-ssl-peer-cert/OTP-13510' into maint-18Erlang/OTP2016-04-266-17/+105
|\ \
| * | inets: Prepare for releaseIngela Anderton Andin2016-04-212-3/+7
| * | inets: Add peer_cert to ESI environmentIngela Anderton Andin2016-04-214-14/+98
* | | Merge branch 'ingela/ssl/config-signature-algs/OTP-13261' into maint-18Erlang/OTP2016-04-2616-150/+403
|\ \ \
| * | | ssl: Prepare for releaseIngela Anderton Andin2016-04-062-7/+1
| * | | ssl: Add option signature_algsIngela Anderton Andin2016-04-0614-143/+402
| |/ /
* | | Merge branch 'ingela/ssl/3-4-tuples-cipher-suites-mix/OTP-13511' into maint-18Erlang/OTP2016-04-264-49/+72
|\ \ \ | |/ / |/| |
| * | ssl: Corrections to cipher suite handlingIngela Anderton Andin2016-04-224-49/+72
|/ /
* | Updated OTP versionOTP-18.3.1Erlang/OTP2016-04-012-1/+2
* | Prepare releaseErlang/OTP2016-04-015-4/+100
* | Merge branch 'sverker/erts/trap_exit-race/OTP-13452' into maint-18Erlang/OTP2016-04-011-1/+4
|\ \
| * | erts: Fix race for process_flag(trap_exit,true)Sverker Eriksson2016-04-011-1/+4
* | | Merge branch 'rickard/proc-free-fix/OTP-13446' into maint-18Erlang/OTP2016-04-011-2/+4
|\ \ \
| * | | Fix bad refc management of process structRickard Green2016-03-311-5/+6
* | | | Merge branch 'rickard/port-sig-dropped-fix/OTP-13424' into maint-18Erlang/OTP2016-04-011-1/+12
|\ \ \ \
| * | | | Fix implementation of dropped signal to portRickard Green2016-03-181-1/+12
* | | | | Merge branch 'dgud/mnesia/hang-sym-trans/OTP-13423' into maint-18Erlang/OTP2016-04-011-8/+3
|\ \ \ \ \
| * | | | | mnesia: Send mnesia_down messages to waiting transactionsDan Gudmundsson2016-03-171-8/+3
* | | | | | Merge branch 'rickard/ethr-event-futex-wait-timeout/OTP-13420' into maint-18Erlang/OTP2016-04-011-3/+3
|\ \ \ \ \ \
| * | | | | | Fix premature timeouts for ethread events on LinuxRickard Green2016-03-161-3/+3
* | | | | | | Merge branch 'rickard/last_calls/OTP-13418' into maint-18Erlang/OTP2016-04-012-1/+12
|\ \ \ \ \ \ \
| * | | | | | | Unbreak process_info(Pid,last_calls)Rickard Green2016-03-162-1/+12
| |/ / / / / /
* | | | | | | Merge branch 'lukas/erts/fix_enomem_error_code/OTP-13419' into maint-18Erlang/OTP2016-04-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | erts: Create erl_crash.dump when out of memoryLukas Larsson2016-03-161-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ia/inets/bracket-option/OTP-13417' into maint-18Erlang/OTP2016-04-013-2/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | inets: Prepare for releaseIngela Anderton Andin2016-03-172-1/+3