aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-15Adjust test cases for SLES 10 SP 1Raimo Niskanen
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-14[snmp] Loosing log entries when converting a large Audit Trail LogMicael Karlberg
When converting an entire Audit Trail Log in a running system its possble to have log wraps and thereby loosing log entries. In order to prevent this the log is now blocked during conversion (log_to_txt or log_to_io).
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
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
2013-11-13ssh: Eliminate test case failure due to timing issues in test case codeIngela Anderton Andin
2013-11-13ssh: Enhance error handlingIngela Anderton Andin
2013-11-13ssh: Merge connection_manager and connection_handler processesIngela Anderton Andin
Also start adding dialyzer specs and removing dead code
2013-11-13ssh: Remove use of process dictionaryIngela Anderton Andin
This is step one in in making ssh process structure less complicated. As an effect I also found other simplifications/clean ups of the code that could be done.
2013-11-13Merge branch 'maint'Fredrik Gustafsson
2013-11-13Merge branch 'bsmr-erlang/fix_gen_fsm_example/OTP-11472' into maintFredrik Gustafsson
* bsmr-erlang/fix_gen_fsm_example/OTP-11472: fixed small typo (missing right parenthesis) in gen_fsm example
2013-11-13Merge branch 'maint'Fredrik Gustafsson
2013-11-13Merge branch 'fredrik/doc/syntax_highlight/OTP-11237' into maintFredrik Gustafsson
* fredrik/doc/syntax_highlight/OTP-11237: erl_docgen: fix code highlighting and warning and note parts in erl_docgen
2013-11-13erl_docgen: fix code highlighting and warning and note parts in erl_docgenFredrik Gustafsson
2013-11-12[inets/httpd] Improved request handler terminate error-log entryMicael Karlberg
If a request handler terminates abnormally (terminate reason not normal), the error-log entry was a bit obtuse ("Internal Server Error"). This has been improved so that the log entry now also include the actual terminate reason.
2013-11-12[inets/httpd] Improved access log entryMicael Karlberg
Sometimes the size of a response could be as a string.
2013-11-12[inets/httpd] Logging cleanupMicael Karlberg
Remove logging when fo keep-alive connection timeout. This is a normal event (feature) not an error.
2013-11-12[inets/httpd] Fixed mod_head handling of "new" responseMicael Karlberg
2013-11-12Merge branch 'maint'Henrik Nord
2013-11-12Merge branch 'henrik/xcomp-arm' into maintHenrik Nord
2013-11-12add erl-xcom-arm-linux.confHenrik Nord
2013-11-11Merge branch 'maint'Sverker Eriksson
2013-11-11Merge branch 'sverk/valgrind-added-leak-check' into maintSverker Eriksson
* sverk/valgrind-added-leak-check: erts: Prevent valgrind from repeating same memory leaks reports
2013-11-11Clean up address family handling towards ErlangRaimo Niskanen
2013-11-11Fix testcase indentationRaimo Niskanen