aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2013-11-21Merge branch 'maint'Lukas Larsson
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-20Merge branch 'maint'Sverker Eriksson
2013-11-20Merge branch 'sverk/hash_SUITE-bit_level_binaries' into maintSverker Eriksson
2013-11-20Merge branch 'maint'Björn Gustavsson
2013-11-20Merge branch 'bjorn/asn1/fix-union-bug/OTP-11411' into maintBjörn Gustavsson
2013-11-20Merge branch 'maint'Björn Gustavsson
2013-11-20Merge branch 'bjorn/erts/fix-erl_crash_dump/OTP-11450' into maintBjörn Gustavsson
2013-11-20Merge branch 'maint'Hans Nilsson
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
2013-11-19ftp: Implement ftps (upgrade to TLS)Ingela Anderton Andin
2013-11-19erts: Fix test case hash_SUITE:bit_level_binariesSverker Eriksson
2013-11-19Merge branch 'maint'Björn-Egil Dahlberg
2013-11-19Merge branch 'egil/preloaded-debug_info' into maintBjörn-Egil Dahlberg
2013-11-19Merge branch 'maint'Björn-Egil Dahlberg
2013-11-19Merge branch 'egil/clarify-erts-doc' into maintBjörn-Egil Dahlberg
2013-11-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'metadave/dp_typo/OTP-11475' into maintFredrik Gustafsson
2013-11-18Merge branch 'maint'Siri Hansen
2013-11-18Merge branch 'siri/erl_prim_loader/normalize-and-backslash/OTP-11170' into maintSiri Hansen
2013-11-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'fredrik/fix_tests_ssl_not_present/OTP-11474' into maintFredrik Gustafsson
2013-11-18Merge branch 'maint'Fredrik Gustafsson
2013-11-18Merge branch 'mhssler/add-os-unsetenv/OTP-11446' into maintFredrik Gustafsson
2013-11-15Merge branch 'maint'Sverker Eriksson
2013-11-15Merge branch 'sverk/cerl-gdb-fix' into maintSverker Eriksson
2013-11-15Update preloadedSiri Hansen
2013-11-15Merge branch 'maint'Fredrik Gustafsson
2013-11-15Merge branch 'potatosalad/public_key_incorrect_emailaddress/OTP-11470' into m...Fredrik Gustafsson
2013-11-15Fix bug with backslash in erl_prim_loader:normalize/1Siri Hansen
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
2013-11-14Merge branch 'maint'Fredrik Gustafsson