aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-05-10Merge branch 'rickard/rq-len/OTP-13201'Rickard Green
* rickard/rq-len/OTP-13201: Fix testcase Light weight statistics of run queue lengths
2016-02-18Updated OTP versionOTP-18.2.4Erlang/OTP
2016-02-18Prepare releaseErlang/OTP
2016-02-18Merge branch 'siri/ct_netconfc/multpile-end-tags/OTP-13323' into maint-18Erlang/OTP
* siri/ct_netconfc/multpile-end-tags/OTP-13323: [ct_netconfc] Fix XML parsing when multiple messages in package
2016-02-18[ct_netconfc] Fix XML parsing when multiple messages in packageSiri Hansen
If a ssh package contained more than one netconf end tag, then the second end tag was never detected in ct_netconfc:handle_data. Instead it was included in the XML data given to the xmerl parser, which then failed with reason "\"]]>\" is not allowed in content". This problem was introduced by OTP-13007.
2016-01-29Updated OTP versionOTP-18.2.3Erlang/OTP
2016-01-29Update release notesErlang/OTP
2016-01-29Merge branch 'ia/maint/inets/mod_alias/OTP-13248' into maint-18Erlang/OTP
* ia/maint/inets/mod_alias/OTP-13248: inets: Prepare for release inets: Traverse all aliases looking for the longest match inets: Use re instead of inets_regexp # Conflicts: # lib/inets/vsn.mk
2016-01-28inets: Prepare for releaseIngela Anderton Andin
2016-01-28inets: Traverse all aliases looking for the longest matchIngela Anderton Andin
Before the first matching alias was returned, but we want the longest one to be returned.
2016-01-28inets: Use re instead of inets_regexpIngela Anderton Andin
2016-01-22Fix testcaseRickard Green
2016-01-08Updated OTP versionOTP-18.2.2Erlang/OTP
2016-01-08Update release notesErlang/OTP
2016-01-08Merge branch 'hans/ssh/keyboard_interactive0/OTP-13255' into maint-18Erlang/OTP
* hans/ssh/keyboard_interactive0/OTP-13255: ssh: update vsn.mk to 4.2.1 ssh: handle secondary ssh_msg_userauth_info_request message ssh: testcase for abnormal keyboard-interactive authentication
2016-01-08ssh: update vsn.mk to 4.2.1Hans Nilsson
2016-01-08ssh: handle secondary ssh_msg_userauth_info_request messageHans Nilsson
2016-01-08ssh: testcase for abnormal keyboard-interactive authenticationHans Nilsson
2015-12-30Light weight statistics of run queue lengthsRickard Green
- statistics(total_run_queue_lengths) - statistics(run_queue_lengths) - statistics(total_active_tasks) - statistics(active_tasks) Conflicts: erts/emulator/beam/erl_process.c
2015-12-17Updated OTP versionOTP-18.2.1Erlang/OTP
2015-12-17Update release notesErlang/OTP
2015-12-17Update version numbersErlang/OTP
2015-12-17Merge branch 'jj1bdx/jj1bdx-18.2-freebsd-hipe-fix-2' into maintErlang/OTP
* jj1bdx/jj1bdx-18.2-freebsd-hipe-fix-2: hipe_x86_signal.c: add FreeBSD sigaction code
2015-12-17Merge branch 'egil/fix-windows-paths/OTP-13202' into maintErlang/OTP
* egil/fix-windows-paths/OTP-13202: Revert "Fix erroneous splitting of emulator path"
2015-12-17Revert "Fix erroneous splitting of emulator path"Björn-Egil Dahlberg
This reverts commit 731890f3b4ac62eed1221aa7d9fd2bfa6bf51d8c.
2015-12-17hipe_x86_signal.c: add FreeBSD sigaction codeKenji Rikitake
* erts/emulator/hipe/hipe_x86_signal.c: add FreeBSD sigaction code, based on the Darwin (OS X) code
2015-12-16Merge tag 'OTP-18.2' into maintHenrik Nord
=== OTP-18.2 === Changed Applications: - asn1-4.0.1 - common_test-1.11.1 - compiler-6.0.2 - crypto-3.6.2 - dialyzer-2.8.2 - diameter-1.11.1 - erl_docgen-0.4.1 - erl_interface-3.8.1 - erts-7.2 - eunit-2.2.12 - hipe-3.14 - inets-6.1 - jinterface-1.6.1 - kernel-4.1.1 - observer-2.1.1 - parsetools-2.1.1 - public_key-1.1 - runtime_tools-1.9.2 - sasl-2.6.1 - snmp-5.2.1 - ssh-4.2 - ssl-7.2 - stdlib-2.7 - test_server-3.9.1 - tools-2.8.2 - typer-0.9.10 - wx-1.6 - xmerl-1.3.9 Unchanged Applications: - cosEvent-2.2 - cosEventDomain-1.2 - cosFileTransfer-1.2 - cosNotification-1.2 - cosProperty-1.2 - cosTime-1.2 - cosTransactions-1.3 - debugger-4.1.1 - edoc-0.7.17 - eldap-1.2 - et-1.5.1 - gs-1.6 - ic-4.4 - megaco-3.18 - mnesia-4.13.2 - odbc-2.11.1 - orber-3.8 - os_mon-2.4 - ose-1.1 - otp_mibs-1.1 - percept-0.8.11 - reltool-0.7 - syntax_tools-1.7 - webtool-0.9
2015-12-15Merge branch 'ia/libressl' into maintIngela Anderton Andin
* ia/libressl: ssl: Print openssl version string ssl: Do not use environment variables in openSSL config file
2015-12-15ssl: Convert all test to use "ssl_test_lib:portable_open_port"Ingela Anderton Andin
2015-12-15Updated OTP versionOTP-18.2Erlang/OTP
2015-12-15Update release notesErlang/OTP
2015-12-15Update version numbersErlang/OTP
2015-12-15Merge branch 'ia/libressl' into maintErlang/OTP
* ia/libressl: ssl: Print openssl version string ssl: Do not use environment variables in openSSL config file
2015-12-15Merge branch 'siri/appups-18.2' into maintErlang/OTP
* siri/appups-18.2: Update appups in kernel, stdlib and sasl for OTP-18.2
2015-12-15Merge branch 'ia/inets/dialyzer-custom' into maintIngela Anderton Andin
* ia/inets/dialyzer-custom: inets: Include behaviour modules in install target inets: Fix dialyzer warning
2015-12-15inets: Include behaviour modules in install targetIngela Anderton Andin
2015-12-15inets: Fix dialyzer warningIngela Anderton Andin
2015-12-14Merge branch 'zandra/update-windows-docs' into maintZandra
* zandra/update-windows-docs: update the howto build and install on windows documentation OTP-13192
2015-12-14update the howto build and install on windows documentationZandra
OTP-13188 ticket for: 192c4a80c7d6fe9949aecb864901c4a3d9549f36
2015-12-14ssl: Print openssl version stringIngela Anderton Andin
2015-12-14Merge branch 'zandra/fix-snmp-appup' into maintZandra
* zandra/fix-snmp-appup: correct the snmp app up file
2015-12-14ssl: Do not use environment variables in openSSL config fileIngela Anderton Andin
LibreSSL does not allow it.
2015-12-14Update preloaded modulesHenrik Nord
2015-12-14Update primary bootstrapHenrik Nord
2015-12-14Merge branch 'dgud/wx/fix-observer-display' into maintDan Gudmundsson
* dgud/wx/fix-observer-display: wx: Revert part of 617387025b698c
2015-12-14Merge branch 'ia/pr/919/OTP-13189' into maintIngela Anderton Andin
* ia/pr/919/OTP-13189: ssl: fix hibernate_after with instant or near instant timeouts
2015-12-12wx: Revert part of 617387025b698cDan Gudmundsson
Causes issues on mac and observer
2015-12-11Merge branch 'sverk/setnode-rename-bug/OTP-13076' into maintSverker Eriksson
* sverk/setnode-rename-bug/OTP-13076: erts: Fix correct node name for DTRACE
2015-12-11erts: Fix correct node name for DTRACESverker Eriksson
broken by 949de78331b9c4ecb9.
2015-12-11ssl: fix hibernate_after with instant or near instant timeoutsAndrey Mayorov