summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated OTP versionOTP-18.1Erlang/OTP2015-09-212-1/+2
* Prepare releaseErlang/OTP2015-09-2127-12/+797
* Merge branch 'anders/diameter/18.1/OTP-12978' into maintAnders Svensson2015-09-211-61/+0
|\
| * Remove 1.11 release notesAnders Svensson2015-09-171-61/+0
* | Merge branch 'ia/ssl/cuddle' into maintIngela Anderton Andin2015-09-211-1/+1
|\ \
| * | ssl: listen socket should be set to active falseIngela Anderton Andin2015-09-211-1/+1
* | | Merge branch 'siri/sasl-vsn-OTP-18.1' into maintBjörn Gustavsson2015-09-212-3/+5
|\ \ \
| * | | Update sasl vsn to 2.6Siri Hansen2015-09-172-3/+5
* | | | Merge branch 'hb/app_vsn' into maintHans Bolinder2015-09-217-11/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Update application versionsHans Bolinder2015-09-187-11/+15
* | | | Merge branch 'ia/ssl/soft-upgrade' into maintIngela Anderton Andin2015-09-202-35/+148
|\ \ \ \ | |/ / / |/| | |
| * | | ssl: Correct soft upgrade testIngela Anderton Andin2015-09-182-35/+148
|/ / /
* | | Merge branch 'ia/inets/next/version' into maintIngela Anderton Andin2015-09-182-1/+3
|\ \ \
| * | | inets: Prepare for releaseIngela Anderton Andin2015-09-172-1/+3
* | | | Merge branch 'ia/ssl/cuddle_tests' into maintIngela Anderton Andin2015-09-181-1/+4
|\ \ \ \
| * | | | ssl: Timeout tuningIngela Anderton Andin2015-09-171-1/+4
* | | | | Merge branch 'dgud/stdlib/fix-file-error_log-leak' into maintDan Gudmundsson2015-09-182-8/+8
|\ \ \ \ \
| * | | | | stdlib: Fix leaking files after error_logger:logfile(close)Dan Gudmundsson2015-09-172-8/+8
* | | | | | Merge branch 'lukas/erts/ttsl_eintr/OTP-12987' into maintRickard Green2015-09-171-7/+8
|\ \ \ \ \ \
| * | | | | | erts: Make sure to deal with EINTR write failuresLukas Larsson2015-09-161-7/+8
* | | | | | | Merge branch 'siri/cuddle-maint' into maintSiri Hansen2015-09-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Exclude ose application from upgrade testSiri Hansen2015-09-171-1/+1
|/ / / / / /
* | | | | | Merge branch 'goertzenator/enif_make_pid-unused_param' into maintHenrik Nord2015-09-171-1/+1
|\ \ \ \ \ \
| * | | | | | fix unused parameter warning in enif_make_pidDaniel Goertzen2015-08-111-1/+1
* | | | | | | Merge branch 'mikpe/erts-binary_to_integer-fix' into maintHenrik Nord2015-09-172-1/+4
|\ \ \ \ \ \ \
| * | | | | | | erts: fix binary_to_integer boundary caseMikael Pettersson2015-07-312-1/+4
| |/ / / / / /
* | | | | | | Merge branch 'leoliu/export-catch_exception' into maintHenrik Nord2015-09-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Export shell:catch_exception/1 as documentedLeo Liu2015-07-071-1/+1
* | | | | | | | Merge branch 'hb/stdlib/update_app_vsn' into maintHans Bolinder2015-09-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | stdlib: Update application versionHans Bolinder2015-09-171-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'hb/update_version_numbers' into maintHans Bolinder2015-09-163-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update application versionsHans Bolinder2015-09-163-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'ia/odbc/next-version' into maintIngela Anderton Andin2015-09-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | odbc: Prepare for releaseIngela Anderton Andin2015-09-161-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'ia/public_key/next-version' into maintIngela Anderton Andin2015-09-161-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | public_key: Document enhancementsIngela Anderton Andin2015-09-161-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dgud/wx/add-missing-aui-func/OTP-12961' into maintDan Gudmundsson2015-09-1618-3071/+3715
|\ \ \ \ \ \
| * | | | | | wx: Fix wxAuiManager:getAllPanes/1Dan Gudmundsson2015-09-0212-2772/+3027
| * | | | | | wx: Add missing aui functionalityDan Gudmundsson2015-08-2816-2987/+3376
* | | | | | | Merge branch 'dgud/mnesia/index-timing/OTP-12972' into maintDan Gudmundsson2015-09-162-11/+35
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | mnesia: Improve index updatesDan Gudmundsson2015-09-102-11/+35
| |/ / / / /
* | | | | | Merge branch 'ia/ssl/next-version' into maintIngela Anderton Andin2015-09-162-1/+13
|\ \ \ \ \ \
| * | | | | | ssl: Prepare for releaseIngela Anderton Andin2015-09-162-1/+13
|/ / / / / /
* | | | | | Merge branch 'ia/ssl/register-unique-session/OTP-12980' into maintIngela Anderton Andin2015-09-164-15/+80
|\ \ \ \ \ \
| * | | | | | ssl: Correct return value of default session callback moduleIngela Anderton Andin2015-09-154-15/+80
* | | | | | | Merge branch 'ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832' into maintIngela Anderton Andin2015-09-166-72/+220
|\ \ \ \ \ \ \
| * | | | | | | ssl: Better timeout gaurdsIngela Anderton Andin2015-09-161-8/+12
| * | | | | | | ssl: Improve shutdown logicIngela Anderton Andin2015-09-166-64/+208
| |/ / / / / /
* | | | | | | Merge branch 'ia/pr/800/OTP-12984' into maintIngela Anderton Andin2015-09-153-4/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | inets: Forward connection errors with https proxyKirilll Zaborsky2015-09-083-4/+28
View Lorry Controller Status