aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-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
2013-11-19Merge branch 'egil/clarify-erts-doc' into maintBjörn-Egil Dahlberg
* egil/clarify-erts-doc: erts: Clarify documentation for erlang:statistics(run_queue)
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-15Merge branch 'maint'Sverker Eriksson
2013-11-15Merge branch 'sverk/cerl-gdb-fix' into maintSverker Eriksson
* sverk/cerl-gdb-fix: erts: Fix cerl -gdb
2013-11-15Update preloadedSiri Hansen
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-14Merge branch 'maint'Fredrik Gustafsson
2013-11-14Merge branch 'efine/pr/multicall-doc/OTP-11471' into maintFredrik Gustafsson
* efine/pr/multicall-doc/OTP-11471: Fix rpc multicall sample code
2013-11-14[eldap, inets]: fix testcases when ssl not is presentFredrik Gustafsson
2013-11-13erts: Fix cerl -gdbSverker Eriksson
by replacing all newlines in $beam_args with space
2013-11-13ssh: Logging fun and document enhancementIngela Anderton Andin
2013-11-13Merge branch 'bmk/inets/httpd/fix_mod_head_response/OTP-11328' into maintMicael Karlberg
2013-11-13ssh: Add CLI test caseIngela Anderton Andin
2013-11-13ssh: Quicker shutdown of an ssh dameonIngela Anderton Andin
OTP-11339
2013-11-13ssh: Add option to disallow CLIIngela Anderton Andin
OTP-10976
2013-11-13ssh: Simplify handling of connection attributes (e.i. user and sockname)Ingela Anderton Andin
OTP-11296
2013-11-13ssh: Make inet option configurable and remove ipv6_disabled optionIngela Anderton Andin