aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-03-27Merge branch 'fredrik/ct/telnet_testcases' into maintFredrik Gustafsson
* fredrik/ct/telnet_testcases: Added testcases for ct_telnet and opportunity to connect to telnet without user and password.
2013-03-27Added testcases for ct_telnet and opportunity to connect to telnet without ↵Fredrik Gustafsson
user and password.
2013-03-27Merge branch 'nox/ssh/fix-ssh-html-doc/OTP-10983' into maintFredrik Gustafsson
* nox/ssh/fix-ssh-html-doc/OTP-10983: Properly ignore everything in lib/ssh/doc/html/
2013-03-26Merge branch 'vk/fix_ssl_connection/OTP-10980' into maintFredrik Gustafsson
* vk/fix_ssl_connection/OTP-10980: Added comment about proxy certificates Fix ssl_connection to support reading proxy/chain certificates
2013-03-26Merge branch 'dgud/testcase_fixes' into maintDan Gudmundsson
* dgud/testcase_fixes: Fix timers mnesia: Decrease test times Add debug printouts wx: Fix failing testcases stdlib: Ignore symlink tests on windows
2013-03-25Merge branch 'maint-r16' into maintLars Thorsen
* maint-r16: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-25Added comment about proxy certificatesFredrik Gustafsson
2013-03-22Merge branch 'lars/orber/corbaloc-bug-r16-version/OTP-10675' into maint-r16Erlang/OTP
* lars/orber/corbaloc-bug-r16-version/OTP-10675: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-21Merge branch 'maint-r15' into lars/orber/corbaloc-bug-r16-version/OTP-10675Lars Thorsen
* maint-r15: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-21Fix ssl_connection to support reading proxy/chain certificatesValentin Kuznetsov
2013-03-19Update primary bootstrapBjörn Gustavsson
2013-03-19Merge branch 'bjorn/compiler/fix-slow-compilation/OTP-10939' into maintBjörn Gustavsson
* bjorn/compiler/fix-slow-compilation/OTP-10939: Fix slow compilation of complex guards
2013-03-19Fix slow compilation of complex guardsBjörn Gustavsson
beam_utils:is_not_used_at/3 could be very slow for complex guards, because the cached result for previously encountered labels were neither used nor updated within blocks. Reported-by: Magnus Müller
2013-03-19Merge branch 'bjorn/asn1/fix-latin1-issue' into maintBjörn Gustavsson
* bjorn/asn1/fix-latin1-issue: Eliminate latin1 encoded characters
2013-03-19Merge branch 'maint-r16' into maintAnders Svensson
2013-03-19Prepare releaseErlang/OTP
2013-03-19Merge branch 'anders/diameter/vendor_specific_app_id/OTP-10942' into maint-r16Anders Svensson
* anders/diameter/vendor_specific_app_id/OTP-10942: Minor capx suite fix Update appup, vsn -> 1.4.1.1 Deal with RFC 6733 change to Vendor-Specific-Application-Id
2013-03-19Merge branch 'anders/diameter/reopen_abuse/OTP-10898' into maint-r16Anders Svensson
* anders/diameter/reopen_abuse/OTP-10898: Update appup Tweak okay -> suspect config Add testcases for watchdog_config Rework watchdog suite to remove most timing dependencies Rework stats to avoid concurrent read and write Minor spec fix Add transport_opt() watchdog_config
2013-03-19Prepare releaseErlang/OTP
2013-03-19Merge branch 'fredrik/ssh/timing_rekey/OTP-10940' into maint-r16Anders Svensson
* fredrik/ssh/timing_rekey/OTP-10940: Removed timing rekeying
2013-03-19Merge branch 'hb/stdlib/escript_unicode/OTP-10951' into maintHans Bolinder
* hb/stdlib/escript_unicode/OTP-10951: Let escript recognize an encoding comment on the second line
2013-03-19Let escript recognize an encoding comment on the second lineHans Bolinder
The manual says that an Emacs directive can be placed on the second line. With this patch that directive is also recognized when selecting encoding of the script.
2013-03-19Merge branch 'ia/inets/cookie-bug/OTP-10956' into maintIngela Anderton Andin
* ia/inets/cookie-bug/OTP-10956: inets httpc: Revert incorrect commit regarding cookie handling.
2013-03-19Merge branch 'jb/ssl/fix-ssl-npn-doc/OTP-10955' into maintFredrik Gustafsson
* jb/ssl/fix-ssl-npn-doc/OTP-10955: Fix SSL Next Protocol Negotiation documentation
2013-03-19Minor capx suite fixAnders Svensson
2013-03-19Merge branch 'hb/test_case_corrections' into maintHans Bolinder
* hb/test_case_corrections: Fix a test case Fix a test case Fix a test case bug Fix a test case bug Remove ?line from dets_SUITE.erl Adjust dets.erl to cope with an evil test case Correct a disk_log testcase
2013-03-18Merge branch 'anders/diameter/distribution/OTP-9610' into maintAnders Svensson
* anders/diameter/distribution/OTP-9610: Specify timeouts to ct_slave:start/2 More flexible distribution config Add distribution suite Document distribution config Distribution fixes
2013-03-18Fix a test caseHans Bolinder
The application/module 'gs' is not available on all platforms.
2013-03-18Fix a test caseHans Bolinder
interactive_shell_SUITE: nodes names with '-'
2013-03-18Fix a test case bugHans Bolinder
shell_SUITE: Calling i() did not work because if there are more than 100 processes c:i() will go into pager mode, asking for input.
2013-03-18Fix a test case bugHans Bolinder
io_proto_SUITE: node names containing some '-' did not work.
2013-03-18Remove ?line from dets_SUITE.erlHans Bolinder
2013-03-18Adjust dets.erl to cope with an evil test caseHans Bolinder
The test case deletes a Dets process while it is repairing a file. Another client waiting for the Dets process to reply then kicks in and repairs the file. Apparently the temporary file was still open, resulting in an eacces error on Windows.
2013-03-18Correct a disk_log testcaseHans Bolinder
2013-03-18Update appup, vsn -> 1.4.1.1Anders Svensson
2013-03-18Deal with RFC 6733 change to Vendor-Specific-Application-IdAnders Svensson
RFC 6733 has changed the arity of Vendor-Id in this Grouped AVP, from 1* in RFC 3588 to 1 in RFC 6773. This impacts the generated dictionary modules: Vendor-Id is expected to be list-valued in the 3588 dictionary, integer-valued in the 6733 dictionary. This, in turn, breaks the independence of capabilities configuration on a service or transport from the dictionary that will be used to encode an outgoing CER or CEA. This commit fixes this by massaging any Vendor-Specific-Application-Id config as appropriate when constructing CER or CEA for a given dictionary.
2013-03-18Update appupAnders Svensson
2013-03-18inets httpc: Revert incorrect commit regarding cookie handling.Ingela Anderton Andin
2013-03-18Merge branch 'pan/dtrace_header_dependency' into maintPatrik Nyblom
* pan/dtrace_header_dependency: Add dependency to dtrace header for parallell make OTP-10949
2013-03-18Add dependency to dtrace header for parallell makePatrik Nyblom
2013-03-18Merge branch 'pan/fallocate_stricter_autoconf' into maintPatrik Nyblom
* pan/fallocate_stricter_autoconf: Make configure test for fallocate try to link OTP-10948
2013-03-18Make configure test for fallocate try to linkPatrik Nyblom
This hopefully detects fault glibc's where fallocate64 is nonexistent.
2013-03-18Merge branch 'pan/wrong_anchor_in_erl.xml' into maintPatrik Nyblom
* pan/wrong_anchor_in_erl.xml: Set unique anchor on +pc flag in erl.xml OTP-10947
2013-03-18Set unique anchor on +pc flag in erl.xmlPatrik Nyblom
2013-03-18Merge branch 'lars/orber/corbaloc-bug/OTP-10675' into maint-r15Erlang/OTP
* lars/orber/corbaloc-bug/OTP-10675: [orber] Fix bug in corbaloc/corbaname over ssl
2013-03-18[orber] Fix bug in corbaloc/corbaname over sslLars Thorsen
2013-03-17Fix SSL Next Protocol Negotiation documentationJulien Barbot
Fix inconsistencies Fix typos Fix data types definition
2013-03-17Specify timeouts to ct_slave:start/2Anders Svensson
2013-03-17More flexible distribution configAnders Svensson
Allow both share_peers and use_shared_peers to be a list of nodes, or a function that returns a list of nodes.
2013-03-17Add distribution suiteAnders Svensson