aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-09-17Merge branch 'maint'Rickard Green
* maint: erts: Make sure to deal with EINTR write failures
2015-09-17Merge branch 'lukas/erts/ttsl_eintr/OTP-12987' into maintRickard Green
* lukas/erts/ttsl_eintr/OTP-12987: erts: Make sure to deal with EINTR write failures
2015-09-17Remove 1.11 release notesAnders Svensson
These were added manually in merge commit 8c5d719a, but that was wrong: the notes will be generated. Note that OTP-12791 in the comment for commit 5a339bcb is wrong: it's OTP-12891.
2015-09-17Merge branch 'maint'Henrik Nord
2015-09-17Merge branch 'siri/cuddle-maint' into maintSiri Hansen
* siri/cuddle-maint: Exclude ose application from upgrade test
2015-09-17Update sasl vsn to 2.6Siri Hansen
2015-09-17Exclude ose application from upgrade testSiri Hansen
2015-09-17inets: Prepare for releaseIngela Anderton Andin
2015-09-17stdlib: Fix leaking files after error_logger:logfile(close)Dan Gudmundsson
Introduced when changing state from tuple to record.
2015-09-17Merge branch 'goertzenator/enif_make_pid-unused_param' into maintHenrik Nord
* goertzenator/enif_make_pid-unused_param: fix unused parameter warning in enif_make_pid OTP-12989
2015-09-17Merge branch 'mikpe/erts-binary_to_integer-fix' into maintHenrik Nord
* mikpe/erts-binary_to_integer-fix: erts: fix binary_to_integer boundary case OTP-12988
2015-09-17Merge branch 'leoliu/export-catch_exception' into maintHenrik Nord
* leoliu/export-catch_exception: Export shell:catch_exception/1 as documented
2015-09-17Merge branch 'maint'Hans Bolinder
* maint: stdlib: Update application version
2015-09-17Merge branch 'hb/stdlib/update_app_vsn' into maintHans Bolinder
* hb/stdlib/update_app_vsn: stdlib: Update application version
2015-09-17stdlib: Update application versionHans Bolinder
2015-09-16Merge branch 'maint'Hans Bolinder
* maint: Update application versions
2015-09-16Merge branch 'hb/update_version_numbers' into maintHans Bolinder
* hb/update_version_numbers: Update application versions
2015-09-16Update application versionsHans Bolinder
2015-09-16Merge branch 'maint'Ingela Anderton Andin
2015-09-16Merge branch 'ia/odbc/next-version' into maintIngela Anderton Andin
* ia/odbc/next-version: odbc: Prepare for release
2015-09-16odbc: Prepare for releaseIngela Anderton Andin
2015-09-16erts: Make sure to deal with EINTR write failuresLukas Larsson
2015-09-16Merge branch 'maint'Ingela Anderton Andin
2015-09-16Merge branch 'ia/public_key/next-version' into maintIngela Anderton Andin
* ia/public_key/next-version: public_key: Document enhancements
2015-09-16public_key: Document enhancementsIngela Anderton Andin
OTP-12986
2015-09-16Merge branch 'maint'Dan Gudmundsson
* maint: mnesia: Improve index updates wx: Fix wxAuiManager:getAllPanes/1 wx: Add missing aui functionality
2015-09-16Merge branch 'dgud/wx/add-missing-aui-func/OTP-12961' into maintDan Gudmundsson
* dgud/wx/add-missing-aui-func/OTP-12961: wx: Fix wxAuiManager:getAllPanes/1 wx: Add missing aui functionality
2015-09-16Merge branch 'dgud/mnesia/index-timing/OTP-12972' into maintDan Gudmundsson
* dgud/mnesia/index-timing/OTP-12972: mnesia: Improve index updates
2015-09-16Merge branch 'maint'Ingela Anderton Andin
2015-09-16Merge branch 'ia/ssl/next-version' into maintIngela Anderton Andin
* ia/ssl/next-version: ssl: Prepare for release
2015-09-16ssl: Prepare for releaseIngela Anderton Andin
We do not want ssl_soft_upgrade_SUITE to fail, but for now we do not know the details of these changes so we use a general fallback for now.
2015-09-16Merge branch 'maint'Ingela Anderton Andin
2015-09-16Merge branch 'ia/ssl/register-unique-session/OTP-12980' into maintIngela Anderton Andin
* ia/ssl/register-unique-session/OTP-12980: ssl: Correct return value of default session callback module
2015-09-16Merge branch 'ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832' into maintIngela Anderton Andin
* ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832: ssl: Better timeout gaurds ssl: Improve shutdown logic
2015-09-16ssl: Better timeout gaurdsIngela Anderton Andin
2015-09-16ssl: Improve shutdown logicIngela Anderton Andin
Add possibility to downgrade an SSL/TLS connection to a tcp connection, and give back the socket control to a user process. Add application setting to be able to change fatal alert shutdown timeout, also shorten the default timeout. The fatal alert timeout is the number of milliseconds between sending of a fatal alert and closing the connection. Waiting a little while improves the peers chances to properly receiving the alert so it may shutdown gracefully.
2015-09-15Merge branch 'maint'Ingela Anderton Andin
2015-09-15Merge branch 'ia/pr/800/OTP-12984' into maintIngela Anderton Andin
* ia/pr/800/OTP-12984: inets: Forward connection errors with https proxy
2015-09-15ssl: Correct return value of default session callback moduleIngela Anderton Andin
ssl_session_cache:select_session/2 returned [sesionid(), #session{}] instead of #session{} as the API demands. This was wrongly compensated for in the code in one place making it look like everything was good. But the client check for unique session would always fail, potentially making the client session table grow a lot and causing long setup times.
2015-09-15Update primary bootstrapHans Bolinder
2015-09-15Merge branch 'hb/finish_line_abstraction/OTP-12861'Hans Bolinder
* hb/finish_line_abstraction/OTP-12861: syntax_tools: Use the erl_anno module a bit more test_server: Fix a bug related to the use of the erl_anno module debugger: Fix a bug related to the use of the erl_anno module stdlib: Remove deprecated functions in erl_parse and erl_scan
2015-09-15syntax_tools: Use the erl_anno module a bit moreHans Bolinder
2015-09-15test_server: Fix a bug related to the use of the erl_anno moduleHans Bolinder
The (harmless) bug was introduced in 42cf8b8.
2015-09-15debugger: Fix a bug related to the use of the erl_anno moduleHans Bolinder
The (harmless) bug was introduced in 541e87f.
2015-09-15stdlib: Remove deprecated functions in erl_parse and erl_scanHans Bolinder
The recently added module erl_anno can no longer handle negative line numbers.
2015-09-14Merge branch 'maint'Anders Svensson
2015-09-14Merge branch 'anders/diameter/18.1/OTP-12978' into maintAnders Svensson
* anders/diameter/18.1/OTP-12978: Update appup for 18.1
2015-09-14Merge branch 'anders/diameter/watchdog/OTP-12969' into maintAnders Svensson
* anders/diameter/watchdog/OTP-12969: Fix watchdog function_clause
2015-09-14Merge branch 'anders/diameter/M-bit/OTP-12947' into maintAnders Svensson
* anders/diameter/M-bit/OTP-12947: Add service_opt() strict_mbit
2015-09-14Merge branch 'maint'Anders Svensson
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 16:06:25 +0000