aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-26hipe: Correct pretty-printing of bitstringsHans Bolinder
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
2014-06-19Updated OTP versionOTP-17.1Erlang/OTP
2014-06-19Prepare releaseErlang/OTP
2014-06-19Merge branch 'sverk/crypto-ec-mem-leak/OTP-11999' into maintSverker Eriksson
* sverk/crypto-ec-mem-leak/OTP-11999: crypto: Fix memory leak of EC "keys" and "points" crypto: Fix crypto for debug and valgrind
2014-06-18crypto: Fix memory leak of EC "keys" and "points"Sverker Eriksson
2014-06-18Merge branch 'maint'Björn-Egil Dahlberg
2014-06-18Merge branch 'egil/fix-doc-links' into maintBjörn-Egil Dahlberg
* egil/fix-doc-links: doc: Fix broken links in Installation Guide doc: Fix broken links
2014-06-18Merge branch 'maint'Magnus Lidén
2014-06-18Update preloaded modulesMagnus Lidén
2014-06-18Update primary bootstrapMagnus Lidén
2014-06-18Merge branch 'maint'Siri Hansen
2014-06-18Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [reltool] Back out adaption to better quoting on windows
2014-06-18[reltool] Back out adaption to better quoting on windowsSiri Hansen
This commit only changes the test. It reverts commit 710a1fa ([reltool] Adapt tests to better quoting of paths on windows) because the commit that actually changed the quoting behaviour on windows was moved from the maint branch to master (9633e0e win32: Fix quoting of paths).
2014-06-18Merge branch 'maint'Siri Hansen
2014-06-18Merge branch 'siri/cuddle-with-tests' into maintSiri Hansen
* siri/cuddle-with-tests: [upgrade_SUITE] Set previous major to r16b
2014-06-18Merge branch 'maint'Ingela Anderton Andin
2014-06-18Merge branch 'ia/inets/prep-for-release' into maintIngela Anderton Andin
* ia/inets/prep-for-release: inets: Prepare for release
2014-06-17crypto: Fix crypto for debug and valgrindSverker Eriksson
without relying on opt-version has been built. Removed ASSERT to make crypto_callback.debug.so work without dynamic linking to libcrypto.so.
2014-06-17doc: Fix broken links in Installation GuideBjörn-Egil Dahlberg
2014-06-17Merge branch 'maint'Hans Bolinder
* maint: [dialyzer] Correct a doc bug introduced in 0b041238 [dialyzer] Use the option 'dialyzer' to control the compiler [dialyzer] Fix handling of literal records
2014-06-17doc: Fix broken linksBjörn-Egil Dahlberg
2014-06-17Merge branch 'hb/dialyzer/fix_recognition_of_records/OTP-11935' into maintHans Bolinder
* hb/dialyzer/fix_recognition_of_records/OTP-11935: [dialyzer] Correct a doc bug introduced in 0b041238 [dialyzer] Use the option 'dialyzer' to control the compiler [dialyzer] Fix handling of literal records
2014-06-17inets: Prepare for releaseIngela Anderton Andin
2014-06-17[dialyzer] Correct a doc bug introduced in 0b041238Hans Bolinder
2014-06-17[dialyzer] Use the option 'dialyzer' to control the compilerHans Bolinder
2014-06-17[dialyzer] Fix handling of literal recordsHans Bolinder
This ticket is about records in Erlang code, and when to check the fields against the (optional) types given when defining records. Dialyzer operates on the Erlang Core format, where there are no trace of records. The fix implemented is a Real Hack: Given the new option 'dialyzer' erl_expand_records marks the line number of records in a way that is undone by v3_core, which in turn inserts annotations that can be recognized by Dialyzer.
2014-06-17Merge branch 'maint'Ingela Anderton Andin
2014-06-17Merge branch 'ia/ssl/revert-due-to-performance-issue' into maintIngela Anderton Andin
* ia/ssl/revert-due-to-performance-issue: Revert "ssl: Avoid creating a huge session table"
2014-06-17Merge branch 'maint'Björn Gustavsson
* maint: Fix handling of latin1 characters in false ifdef branches add_abstract_code: Remove 'from_asm' option Remove documentation and stub for non-exist file:file_info/1
2014-06-17Merge branch 'bjorn/compiler/fix-latin1-fallback/OTP-11987' into maintBjörn Gustavsson
* bjorn/compiler/fix-latin1-fallback/OTP-11987: Fix handling of latin1 characters in false ifdef branches
2014-06-17Merge branch 'bjorn/kernel/remove-file_info-vestiges/OTP-11982' into maintBjörn Gustavsson
* bjorn/kernel/remove-file_info-vestiges/OTP-11982: Remove documentation and stub for non-exist file:file_info/1
2014-06-17Merge branch 'bjorn/erts/fix-prim_eval' into maintBjörn Gustavsson
* bjorn/erts/fix-prim_eval: add_abstract_code: Remove 'from_asm' option
2014-06-17Merge branch 'maint'Siri Hansen
2014-06-17Merge branch 'siri/ct-and-cover/OTP-11971' into maintSiri Hansen
* siri/ct-and-cover/OTP-11971: [test_server] Fix bug introduced in 5a3c466
2014-06-16Revert "ssl: Avoid creating a huge session table"Ingela Anderton Andin
This reverts commit fcc6a756277c8f041aae1b2aa431e43f9285c368.
2014-06-16[test_server] Fix bug introduced in 5a3c466Siri Hansen
This was detected by dialyzer - an '=' character too much had erronously been inserted.
2014-06-16Merge branch 'maint'Rickard Green
* maint: Fix redefinition of ETHR_FORCE_INLINE Fix typo in error message in reltool_server
2014-06-16Merge branch 'jjhoo/mingw_compile_fix_forceinline/OTP-11945' into maintRickard Green
* jjhoo/mingw_compile_fix_forceinline/OTP-11945: Fix redefinition of ETHR_FORCE_INLINE
2014-06-16Fix redefinition of ETHR_FORCE_INLINERickard Green
2014-06-16Merge branch 'siri/reltool-typo/OTP-11977' into maintSiri Hansen
* siri/reltool-typo/OTP-11977: Fix typo in error message in reltool_server
2014-06-16Merge branch 'maint'Peter Andersson