aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-28Merge branch 'rickard/prim_inet_close/OTP-11491' into maintRickard Green
* rickard/prim_inet_close/OTP-11491: Fix prim_inet:close/1
2013-11-28Merge branch 'rickard/port_bifs_fix/OTP-11489' into maintRickard Green
* rickard/port_bifs_fix/OTP-11489: Ensure exit signal due to link precede port BIF return
2013-11-28Revert "Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maint"Lukas Larsson
This reverts commit 1562340596938d1f8a84b2ed43f5f0097be66ae7, reversing changes made to a5128108ad3efff77c5080f0769737e70a0bfd82.
2013-11-28Merge branch 'lukas/erts/supercarrier_fix/OTP-11149' into maintLukas Larsson
* lukas/erts/supercarrier_fix/OTP-11149: Improve error info when main carrier creation fails Conflicts: erts/emulator/test/alloc_SUITE.erl
2013-11-27Merge branch 'sverk/crypto-no_answer_from_tc_supervisor' into maintSverker Eriksson
* sverk/crypto-no_answer_from_tc_supervisor: crypto: Avoid test_server crash 'no_answer_from_tc_supervisor'
2013-11-27Merge branch 'sverk/bin2term-bitstr-bugs/OTP-11479' into maintSverker Eriksson
* sverk/bin2term-bitstr-bugs/OTP-11479: erts: Fix bug in binary_to_term for binaries larger than 2^31 erts: Fix bugs in binary_to_term for invalid bitstrings
2013-11-27Merge branch 'sverk/allctr-4byte-align-bug' into maintSverker Eriksson
* sverk/allctr-4byte-align-bug: erts: Fix alignment bug in allocator start code OTP-11496
2013-11-27Merge branch 'sverk/zlib_SUITE-large_deflate-fix' into maintSverker Eriksson
* sverk/zlib_SUITE-large_deflate-fix: kernel: Fix zlib_SUITE:large_deflate
2013-11-27Merge branch 'ia/ssh/no_io/OTP-11490' into maintIngela Anderton Andin
* ia/ssh/no_io/OTP-11490: ssh: Correct arity in ssh_no_io.erl
2013-11-27Merge branch 'ia/ssh/close/OTP-11363' into maintIngela Anderton Andin
* ia/ssh/close/OTP-11363: ssh: Correct close handling
2013-11-26Merge branch 'bmk/snmp/snmp425_integration' into maintMicael Karlberg
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src lib/snmp/src/misc/snmp_log.erl lib/snmp/vsn.mk
2013-11-26kernel: Fix zlib_SUITE:large_deflateSverker Eriksson
Commontest doesn't like arity 0 function with same name as test case.
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
Commit 68263a48bfbdac4dc219a91f06af3d535d881850 got close handling slightly wrong, channels did not get their close message. Commit 32102f1e8225dada7526c9bfee6622f9026ba4cd did not work as expected
2013-11-26Merge branch 'maint-r16' into maintRaimo Niskanen
2013-11-25Merge branch 'raimo/sctp-peernames/OTP-10229' into maint-r16Raimo Niskanen
* raimo/sctp-peernames/OTP-10229: Improve documentation Suppress false valgrind warnings caused by sctp_getpaddrs Document Adjust test cases for SLES 10 SP 1 Clean up address family handling towards Erlang Fix testcase indentation Fix testcases for FreeBSD 9.1 Write testcases for inet:socknames and inet:peernames Implement inet:socknames/1,2 and inet:peernames/1,2 Implement prim_inet:socknames/1,2 and prim_inet:peernames/1,2
2013-11-25Improve documentationRaimo Niskanen
2013-11-25ssh: Correct arity in ssh_no_io.erlIngela Anderton Andin
Also remove import statement as it makes code less intuitive
2013-11-25Improve error info when main carrier creation failsLukas Larsson
Also fix testcase that failed due to main carrier creation failure.
2013-11-25Merge branch 'rickard/acul-bug/OTP-11456' into maintRickard Green
* rickard/acul-bug/OTP-11456: Ensure carrier pool only accessed by schedulers
2013-11-25Merge branch 'rickard/supercarrier-fix/OTP-11149' into maintRickard Green
* rickard/supercarrier-fix/OTP-11149: Fix observer retrieval of alloc info Fix documentation of the +MMsco switch Replace the +MMscmgc switch with +MMscrfsd Add switch for disabling sys_alloc carriers Add support for locking mappings to physical memory
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
Before running a test case named testcase/1, common_test will call testcase/0 (the info function). Exceptions and illegal return values would be silently ignored. In a planned update to common_test, errors will instead cause the test case to fail. The test case otp_8949_a/1 has a helper function called otp_8949_a/0. Rename it to do_otp_8949_a/0. While at it, also fix a copy and paste bug in the list of test cases. otp_8949_a was run twice; otp_8949_b was never run.
2013-11-21Merge branch 'bmk/snmp/snmp4223_integration' into maint-r15Erlang/OTP
* bmk/snmp/snmp4223_integration: [snmp] Adjust verbosity for some of the log test cases [snmp] Loosing log entries when converting a large Audit Trail Log [snmp] Improving ATL handling of corrupt logs
2013-11-21[snmp] Adjust verbosity for some of the log test casesMicael Karlberg
Also fixed release notes. Used wrong (invalid) ticket number on release notes (111453 instead if 11453).
2013-11-21Merge branch 'ia/odbc/sql.h/OTP-11483' into maintLukas Larsson
* ia/odbc/sql.h/OTP-11483: odbc: Add configure check for sql.h
2013-11-21odbc: Add configure check for sql.hIngela Anderton Andin
2013-11-20erts: Fix alignment bug in allocator start codeSverker Eriksson
Bug never released.
2013-11-20Merge branch 'sverk/hash_SUITE-bit_level_binaries' into maintSverker Eriksson
* sverk/hash_SUITE-bit_level_binaries: erts: Fix test case hash_SUITE:bit_level_binaries
2013-11-20Merge branch 'bjorn/asn1/fix-union-bug/OTP-11411' into maintBjörn Gustavsson
* bjorn/asn1/fix-union-bug/OTP-11411: Fix complicated union of INTEGER constraints
2013-11-20Merge branch 'bjorn/erts/fix-erl_crash_dump/OTP-11450' into maintBjörn Gustavsson
* bjorn/erts/fix-erl_crash_dump/OTP-11450: Fix truncated pointers in erl_crash.dump
2013-11-20Suppress false valgrind warnings caused by sctp_getpaddrsSverker Eriksson
2013-11-20Merge branch 'hans/inets/ftps/OTP-11037' into maintHans Nilsson
* hans/inets/ftps/OTP-11037: ftp,ssl: Fixes broken type link (ssloption). ftp: Adds dynamic cert generation to tests. ftp: Clean Makefile and conf file ftp: Linking rfc-refs. ftp: Add documentation. ftp: delete old test files ftp: small fixes ftp: Add ftps documentation ftp: Add timeouts to ssl:connect ftps: working . added some printouts ftp: towards a working ftps, chapter 1 ftp: old ftp_SUITE re-written and works ftp: Implement ftps (upgrade to TLS) ftp: Implement ftps (upgrade to TLS)
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