aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-07-09Merge branch 'maint'Bruce Yinhe
2014-07-09Merge branch 'legoscia/patch-7' into maintBruce Yinhe
OTP-12052 * legoscia/patch-7: erlang:statistics(runtime) returns milliseconds
2014-07-09Merge branch 'maint'Bruce Yinhe
2014-07-09Merge branch 'lucafavatella/refactor-eunit-check_arity' into maintBruce Yinhe
OTP-12051 * lucafavatella/refactor-eunit-check_arity: Refactor function in eunit using is_function/2
2014-07-09Merge branch 'maint'Bruce Yinhe
2014-07-09Merge branch 'nox/fix-javadoc' into maintBruce Yinhe
OTP-12050 * nox/fix-javadoc: Fix a few javadoc errors
2014-07-09Merge branch 'maint'Bruce Yinhe
2014-07-09Merge branch 'vladdu/jinterface_stream_exceptions' into maintBruce Yinhe
OTP-12049 * vladdu/jinterface_stream_exceptions: jinterface: OtpInputStream exceptions show useless value
2014-07-09Merge branch 'dgud/ssl/simple-bench'Dan Gudmundsson
* dgud/ssl/simple-bench: ssl: Bench use two nodes ssl: Add simple benchmarks
2014-07-07Merge branch 'maint'Bruce Yinhe
2014-07-07Merge branch 'dnet/parse_sni' into maintBruce Yinhe
* dnet/parse_sni: added SNI decode test to SSL handshake suite ssl: parse SNI in received client hello records OTP-12048
2014-07-07Merge branch 'maint'Henrik Nord
2014-07-07Merge branch 'nevar/patch-1' into maintHenrik Nord
* nevar/patch-1: Fix typo in Advanced chapter
2014-07-07Merge branch 'maint'Bruce Yinhe
2014-07-07Merge branch 'mururu/fix-typo' into maintBruce Yinhe
* mururu/fix-typo: Fix typo in erl_eval:exprs comments
2014-07-07Merge branch 'maint'Bruce Yinhe
2014-07-07Merge branch 'nox/io_lib_format-width-too-small' into maintBruce Yinhe
* nox/io_lib_format-width-too-small: Properly handle fields too short in io_lib_format OTP-12041
2014-07-04Fix typo in erl_eval:exprs commentsYuki Ito
2014-07-03Merge branch 'siri/master-cuddle-with-tests'Siri Hansen
* siri/master-cuddle-with-tests: [ct] Add test with netconf server on remote node
2014-07-03Merge branch 'siri/sync-stop-gen/OTP-11173'Siri Hansen
* siri/sync-stop-gen/OTP-11173: Fix man page warning in proc_lib.xml
2014-07-02erlang:statistics(runtime) returns millisecondsMagnus Henoch
Specify in the documentation that erlang:statistics(runtime) returns milliseconds.
2014-07-02Refactor function in eunit using is_function/2Luca Favatella
is_function/2 looks present since at least OTP R13B03, so the change shall not undermine running eunit on older versions of Erlang. This commit is only refactoring - it contains no functional changes.
2014-07-02Merge branch 'maint'Bruce Yinhe
2014-07-02Merge branch 'wmalik/processes-doc' into maintBruce Yinhe
* wmalik/processes-doc: rephrase sentence in process links doc
2014-07-02Merge branch 'maint'Magnus Lidén
2014-07-02Fix man page warning in proc_lib.xmlSiri Hansen
2014-07-02Merge branch 'maint-17' into maintMagnus Lidén
2014-07-01ssl: Bench use two nodesDan Gudmundsson
2014-07-01Updated OTP versionOTP-17.1.1Erlang/OTP
2014-07-01Prepare releaseErlang/OTP
2014-07-01Merge branch 'egil/fix-ethr-force-inline/OTP-12010' into maint-17Erlang/OTP
* egil/fix-ethr-force-inline/OTP-12010: vxworks: Fix SYSTEMD_DAEMON_LIBS in configure erts: Separate ethread inlining from ethread.h
2014-07-01Merge branch 'hb/edoc/latin1_fix/OTP-12008' into maint-17Erlang/OTP
* hb/edoc/latin1_fix/OTP-12008: edoc, syntax_tools: Don't fail on invalid UTF-8
2014-07-01[ct] Add test with netconf server on remote nodeSiri Hansen
The new test is related to support sequence seq12645. It tests that the netconf client process dies if the node hosting the netconf server terminates.
2014-07-01Merge branch 'maint'Hans Bolinder
* maint: stdlib: Correct documentation of dets:insert/2
2014-07-01Merge branch 'hb/stdlib/dets_insert_new/OTP-12024' into maintHans Bolinder
* hb/stdlib/dets_insert_new/OTP-12024: stdlib: Correct documentation of dets:insert/2
2014-06-30vxworks: Fix SYSTEMD_DAEMON_LIBS in configureBjörn-Egil Dahlberg
2014-06-30erts: Separate ethread inlining from ethread.hBjörn-Egil Dahlberg
The commit adb5dc0090bc419e2c4c1250653badbddeb6263b (ETHR_FORCE_INLINE) broke some platforms without adequate thread support.
2014-06-30Merge branch 'maint'Hans Bolinder
* maint: hipe: Correct pretty-printing of bitstrings
2014-06-30Merge branch 'hb/hipe/pretty_bitstring/OTP-12015' into maintHans Bolinder
* hb/hipe/pretty_bitstring/OTP-12015: hipe: Correct pretty-printing of bitstrings
2014-06-30stdlib: Correct documentation of dets:insert/2Hans Bolinder
Thanks to Alexei Sholik for reporting the bug.
2014-06-29rephrase sentence in process links docWasif Malik
2014-06-26hipe: Correct pretty-printing of bitstringsHans Bolinder
2014-06-26edoc, syntax_tools: Don't fail on invalid UTF-8Hans Bolinder
As a temporary measure to ease the transition to default UTF-8 encoding, automatically fall back to the Latin-1 encoding (without any warnings; the Erlang Compiler will emit a proper warning). The intention is to remove this workaround in OTP 18 or 19.
2014-06-26Merge branch 'maint'Ingela Anderton Andin
2014-06-26Merge branch 'ia/inets/reload-tests-and-timeout-mixup/OTP-12013' into maintIngela Anderton Andin
* ia/inets/reload-tests-and-timeout-mixup/OTP-12013: inets: Create seperate timeout for TLS/SSL handshake inets: Add reload tests
2014-06-26inets: Create seperate timeout for TLS/SSL handshakeIngela Anderton Andin
We do not want this timeout to be mixed up with the keep alive timeout. We will probably want to make it configurable later.
2014-06-26inets: Add reload testsIngela Anderton Andin
2014-06-25Merge branch 'sverk/ets-wc-lock-alignment/OTP-11974'Sverker Eriksson
* sverk/ets-wc-lock-alignment/OTP-11974: erts: Fix cache alignment for ETS write_concurrency locks
2014-06-24Merge tag 'OTP-17.1'Marcus Arendt
=== OTP-17.1 === Changed Applications: - asn1-3.0.1 - common_test-1.8.1 - compiler-5.0.1 - crypto-3.4 - debugger-4.0.1 - dialyzer-2.7.1 - diameter-1.7 - erl_interface-3.7.17 - erts-6.1 - hipe-3.11 - inets-5.10.2 - kernel-3.0.1 - mnesia-4.12.1 - observer-2.0.1 - reltool-0.6.6 - ssh-3.0.3 - ssl-5.3.5 - stdlib-2.1 - syntax_tools-1.6.15 - test_server-3.7.1 - tools-2.6.15 - typer-0.9.8 - wx-1.3 Unchanged Applications: - cosEvent-2.1.15 - cosEventDomain-1.1.14 - cosFileTransfer-1.1.16 - cosNotification-1.1.21 - cosProperty-1.1.17 - cosTime-1.1.14 - cosTransactions-1.2.14 - edoc-0.7.13 - eldap-1.0.3 - erl_docgen-0.3.5 - et-1.5 - eunit-2.2.7 - gs-1.5.16 - ic-4.3.5 - jinterface-1.5.9 - megaco-3.17.1 - odbc-2.10.20 - orber-3.6.27 - os_mon-2.2.15 - ose-1.0 - otp_mibs-1.0.9 - parsetools-2.0.11 - percept-0.8.9 - public_key-0.22 - runtime_tools-1.8.14 - sasl-2.4 - snmp-4.25.1 - webtool-0.8.10 - xmerl-1.3.7
2014-06-23Merge branch 'maint'Sverker Eriksson