aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2013-11-28Merge branch 'rickard/prim_inet_close/OTP-11491' into maintRickard Green
2013-11-28Merge branch 'rickard/port_bifs_fix/OTP-11489' into maintRickard Green
2013-11-28Revert "Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint"Lukas Larsson
2013-11-28Merge branch 'lukas/erts/supercarrier_fix/OTP-11149' into maintLukas Larsson
2013-11-27Merge branch 'sverk/crypto-no_answer_from_tc_supervisor' into maintSverker Eriksson
2013-11-27Merge branch 'sverk/bin2term-bitstr-bugs/OTP-11479' into maintSverker Eriksson
2013-11-27Merge branch 'sverk/allctr-4byte-align-bug' into maintSverker Eriksson
2013-11-27Merge branch 'sverk/zlib_SUITE-large_deflate-fix' into maintSverker Eriksson
2013-11-27Merge branch 'ia/ssh/no_io/OTP-11490' into maintIngela Anderton Andin
2013-11-27Merge branch 'ia/ssh/close/OTP-11363' into maintIngela Anderton Andin
2013-11-26Merge branch 'bmk/snmp/snmp425_integration' into maintMicael Karlberg
2013-11-26kernel: Fix zlib_SUITE:large_deflateSverker Eriksson
2013-11-26Fix prim_inet:close/1Rickard Green
2013-11-26Ensure exit signal due to link precede port BIF returnRickard Green
2013-11-26ssh: Correct close handlingIngela Anderton Andin
2013-11-26Merge branch 'maint-r16' into maintRaimo Niskanen
2013-11-25Merge branch 'raimo/sctp-peernames/OTP-10229' into maint-r16Raimo Niskanen
2013-11-25Improve documentationRaimo Niskanen
2013-11-25ssh: Correct arity in ssh_no_io.erlIngela Anderton Andin
2013-11-25Improve error info when main carrier creation failsLukas Larsson
2013-11-25Merge branch 'rickard/acul-bug/OTP-11456' into maintRickard Green
2013-11-25Merge branch 'rickard/supercarrier-fix/OTP-11149' into maintRickard Green
2013-11-22Merge branch 'maint-r15' into maint-r16Micael Karlberg
2013-11-22crypto: Avoid test_server crash 'no_answer_from_tc_supervisor'Sverker Eriksson
2013-11-22Rename otp_8949_a/0 which common_test interprets as an info functionBjörn Gustavsson
2013-11-21Merge branch 'bmk/snmp/snmp4223_integration' into maint-r15Erlang/OTP
2013-11-21[snmp] Adjust verbosity for some of the log test casesMicael Karlberg
2013-11-21Merge branch 'ia/odbc/sql.h/OTP-11483' into maintLukas Larsson
2013-11-21odbc: Add configure check for sql.hIngela Anderton Andin
2013-11-20erts: Fix alignment bug in allocator start codeSverker Eriksson
2013-11-20Merge branch 'sverk/hash_SUITE-bit_level_binaries' into maintSverker Eriksson
2013-11-20Merge branch 'bjorn/asn1/fix-union-bug/OTP-11411' into maintBjörn Gustavsson
2013-11-20Merge branch 'bjorn/erts/fix-erl_crash_dump/OTP-11450' into maintBjörn Gustavsson
2013-11-20Suppress false valgrind warnings caused by sctp_getpaddrsSverker Eriksson
2013-11-20Merge branch 'hans/inets/ftps/OTP-11037' into maintHans Nilsson
2013-11-19ftp,ssl: Fixes broken type link (ssloption).Hans Nilsson
2013-11-19ftp: Adds dynamic cert generation to tests.Hans Nilsson
2013-11-19ftp: Clean Makefile and conf fileHans Nilsson
2013-11-19ftp: Linking rfc-refs.Hans Nilsson
2013-11-19ftp: Add documentation.Hans Nilsson
2013-11-19ftp: delete old test filesHans Nilsson
2013-11-19ftp: small fixesHans Nilsson
2013-11-19ftp: Add ftps documentationHans Nilsson
2013-11-19ftp: Add timeouts to ssl:connectHans Nilsson
2013-11-19ftps: workingHans Nilsson
2013-11-19.Hans Nilsson
2013-11-19added some printoutsHans Nilsson
2013-11-19ftp: towards a working ftps, chapter 1Hans Nilsson
2013-11-19ftp: old ftp_SUITE re-written and worksHans Nilsson
2013-11-19ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin