aboutsummaryrefslogtreecommitdiffstats
path: root/lib
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: 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'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 'maint'Lukas Larsson
* maint: odbc: Add configure check for sql.h
2013-11-21odbc: Add configure check for sql.hIngela Anderton Andin
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'Hans 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
2013-11-19ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
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-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'metadave/dp_typo/OTP-11475' into maintFredrik Gustafsson
* metadave/dp_typo/OTP-11475: fixed typo
2013-11-18Merge branch 'maint'Siri Hansen
Conflicts: erts/preloaded/ebin/erl_prim_loader.beam
2013-11-18Merge branch 'siri/erl_prim_loader/normalize-and-backslash/OTP-11170' into maintSiri Hansen
* siri/erl_prim_loader/normalize-and-backslash/OTP-11170: Update preloaded Fix bug with backslash in erl_prim_loader:normalize/1
2013-11-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'fredrik/fix_tests_ssl_not_present/OTP-11474' into maintFredrik Gustafsson
* fredrik/fix_tests_ssl_not_present/OTP-11474: [eldap, inets]: fix testcases when ssl not is present
2013-11-18Merge branch 'maint'Fredrik Gustafsson
Conflicts: bootstrap/lib/kernel/ebin/os.beam
2013-11-18Merge branch 'mhssler/add-os-unsetenv/OTP-11446' into maintFredrik Gustafsson
* mhssler/add-os-unsetenv/OTP-11446: erts: remove ?line macro in testcases Update primary bootstrap Add os:unsetenv/1
2013-11-15Adjust test cases for SLES 10 SP 1Raimo Niskanen
2013-11-15Merge branch 'maint'Fredrik Gustafsson
2013-11-15Merge branch 'potatosalad/public_key_incorrect_emailaddress/OTP-11470' into ↵Fredrik Gustafsson
maint * potatosalad/public_key_incorrect_emailaddress/OTP-11470: public_key_SUITE: Rename id-at-countryName to id-emailAddress public_key: Workaround for incorrectly encoded utf8 emailAddress
2013-11-15Fix bug with backslash in erl_prim_loader:normalize/1Siri Hansen
This function normalizes a path: * convert atoms to strings * flatten strings * convert backslash to a forward slash The bugfix is to only convert backslashes to forward slashes on windows and not on any other platforms.
2013-11-14fixed typoDave Parfitt
2013-11-14Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2013-11-14Merge branch 'ia/ssh/one-connection-process/OTP-11363' into maintIngela Anderton Andin
* ia/ssh/one-connection-process/OTP-11363: ssh: Logging fun and document enhancement ssh: Add CLI test case ssh: Quicker shutdown of an ssh dameon ssh: Add option to disallow CLI ssh: Simplify handling of connection attributes (e.i. user and sockname) ssh: Make inet option configurable and remove ipv6_disabled option ssh: Eliminate test case failure due to timing issues in test case code ssh: Enhance error handling ssh: Merge connection_manager and connection_handler processes ssh: Remove use of process dictionary
2013-11-14Fix observer retrieval of alloc infoRickard Green