aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-11-26Merge branch 'maint'Micael Karlberg
Conflicts: lib/snmp/doc/src/snmpm_user.xml
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-26Merge branch 'maint'Raimo Niskanen
Conflicts: erts/preloaded/ebin/prim_inet.beam lib/kernel/test/gen_sctp_SUITE.erl
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-25Merge branch 'maint'Rickard Green
* maint: Ensure carrier pool only accessed by schedulers
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 'maint'Rickard Green
* maint: 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-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-22Merge branch 'maint'Björn Gustavsson
* maint: Rename otp_8949_a/0 which common_test interprets as an info function
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 'maint'Lukas Larsson
* maint: odbc: Add configure check for sql.h
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-20Merge branch 'maint'Sverker Eriksson
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 'maint'Björn Gustavsson
* maint: Fix complicated union of INTEGER constraints
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 'maint'Björn Gustavsson
* maint: Fix truncated pointers in erl_crash.dump
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 'maint'Hans Nilsson
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
2013-11-19ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
2013-11-19erts: Fix test case hash_SUITE:bit_level_binariesSverker Eriksson
Commontest doesn't like exported functions with same name as test case.
2013-11-19DocumentRaimo Niskanen
2013-11-19Merge branch 'bmk/snmp/blocking_log_during_conversion' into ↵Micael Karlberg
bmk/snmp/snmp425_integration Conflicts: lib/snmp/src/app/snmp.erl
2013-11-19[snmp] Cleanup and changed atl conversion block defaultMicael Karlberg
Changed the default value for the Audit Trail Log conversion to true. Also some cleanup. OTP-11396
2013-11-19Merge branch 'maint'Björn-Egil Dahlberg
2013-11-19Merge branch 'egil/preloaded-debug_info' into maintBjörn-Egil Dahlberg
* egil/preloaded-debug_info: preloaded: Add debug_info to preloaded
2013-11-19Merge branch 'maint'Björn-Egil Dahlberg
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 14:34:16 +0000