aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-09-21Merge branch 'maint'Anders Svensson
2015-09-21Merge branch 'anders/diameter/18.1/OTP-12978' into maintAnders Svensson
* anders/diameter/18.1/OTP-12978: Remove 1.11 release notes
2015-09-21Merge branch 'maint'Anders Svensson
2015-09-21Merge branch 'ia/ssl/cuddle' into maintIngela Anderton Andin
* ia/ssl/cuddle: ssl: listen socket should be set to active false
2015-09-21ssl: listen socket should be set to active falseIngela Anderton Andin
2015-09-21Regain full coverage of beam_blockBjörn Gustavsson
d0784035ab fixed a problem with register corruption. Because of that, opt_moves/2 will never be asked to optimize instructions with more than two destination registers. Therefore, to regain full coverage of beam_block, remove the final clause in opt_moves/2.
2015-09-21Merge branch 'maint'Björn Gustavsson
* maint: Update sasl vsn to 2.6
2015-09-21Merge branch 'siri/sasl-vsn-OTP-18.1' into maintBjörn Gustavsson
* siri/sasl-vsn-OTP-18.1: Update sasl vsn to 2.6
2015-09-21Update primary bootstrapBjörn Gustavsson
2015-09-21Merge branch 'bjorn/compiler/remove-deprecated/OTP-12979'Björn Gustavsson
* bjorn/compiler/remove-deprecated/OTP-12979: core_lib: Remove previously deprecated functions
2015-09-21Merge branch 'maint'Hans Bolinder
* maint: Update application versions
2015-09-21Merge branch 'hb/app_vsn' into maintHans Bolinder
* hb/app_vsn: Update application versions
2015-09-20Merge branch 'maint'Ingela Anderton Andin
2015-09-20Merge branch 'ia/ssl/soft-upgrade' into maintIngela Anderton Andin
* ia/ssl/soft-upgrade: ssl: Correct soft upgrade test
2015-09-18ssl: Correct soft upgrade testIngela Anderton Andin
Soft upgrade test did not work as expected due to that the upgrade frame work keeps the control of the test case process to itself, so we need a proxy process to receive messages from ssl test framework.
2015-09-18Update application versionsHans Bolinder
2015-09-18Merge branch 'maint'Ingela Anderton Andin
2015-09-18Merge branch 'ia/inets/next/version' into maintIngela Anderton Andin
* ia/inets/next/version: inets: Prepare for release
2015-09-18Merge branch 'ia/ssl/cuddle_tests' into maintIngela Anderton Andin
* ia/ssl/cuddle_tests: ssl: Timeout tuning
2015-09-18Merge branch 'maint'Dan Gudmundsson
* maint: stdlib: Fix leaking files after error_logger:logfile(close)
2015-09-18Merge branch 'dgud/stdlib/fix-file-error_log-leak' into maintDan Gudmundsson
* dgud/stdlib/fix-file-error_log-leak: stdlib: Fix leaking files after error_logger:logfile(close)
2015-09-17ssl: Timeout tuningIngela Anderton Andin
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