aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-12-19eldap: fix merge conflictHans Nilsson
2014-12-19Merge branch 'hans/eldap/test_improvents/OTP-12355' into maintHans Nilsson
2014-12-18Merge branch 'maint'Bruce Yinhe
2014-12-18Merge branch 'haguenau/fix-endianness-speling' into maintBruce Yinhe
2014-12-17eldap: Corrects SSL over IPv6 test.Hans Nilsson
2014-12-17eldap: Removes eldap_misc_SUITE that is now included in eldap_basic_SUITE.Hans Nilsson
2014-12-17eldap: Add encode/decode tests.Hans Nilsson
2014-12-17eldap: Merge eldap_connections_SUITE into eldab_basic_SUITEHans Nilsson
2014-12-17 eldap: Adds ssl to connections test suiteHans Nilsson
2014-12-17eldap: Updates basic test suiteHans Nilsson
2014-12-17Merge branch 'maint'Ingela Anderton Andin
2014-12-17Merge branch 'ia/ssh/ssh-connection-protocol-timeout/OTP-12004' into maintIngela Anderton Andin
2014-12-17ssh: Improve errorhandling in ssh_connection.erlIngela Anderton Andin
2014-12-17Merge branch 'maint'Marcus Arendt
2014-12-17Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maintMarcus Arendt
2014-12-16Merge branch 'sverk/ets-take-2/OTP-12309'Sverker Eriksson
2014-12-16Merge branch 'sverk/ct-assert'Sverker Eriksson
2014-12-16Merge branch 'lukas/erts/non-blocking-shell'Lukas Larsson
2014-12-15erts: Fix big-endian issue with printf_putcLukas Larsson
2014-12-12Merge branch 'lukas/erts/cpu_timestamp_linux/OTP-12366'Lukas Larsson
2014-12-12Merge branch 'lukas/erts/non-blocking-shell'Lukas Larsson
2014-12-12erts: Make sure IOV_MAX is enforced for writevLukas Larsson
2014-12-12Merge branch 'maint'Hans Nilsson
2014-12-12Merge branch 'hans/eldap/doc_fixes/OTP-12354' into maintHans Nilsson
2014-12-12Merge branch 'maint'Marcus Arendt
2014-12-12Merge branch 'marcus/fix-eldap-notes' into maintMarcus Arendt
2014-12-12add missing release notesMarcus Arendt
2014-12-10Merge branch 'maint'Rickard Green
2014-12-10Merge branch 'rickard/atomic64/OTP-12351' into maintRickard Green
2014-12-10Use the new 64-bit atomic ops APIRickard Green
2014-12-10Introduce a 64-bit atomic ops APIRickard Green
2014-12-10Merge branch 'ia/scrapinghub/closing_httpc_handler_on_closed_while_send'Ingela Anderton Andin
2014-12-10Merge tag 'OTP-17.4'Marcus Arendt
2014-12-10fix failed conflict resolutionMarcus Arendt
2014-12-09Updated OTP versionOTP-17.4Erlang/OTP
2014-12-09Prepare releaseErlang/OTP
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09Update preloaded modulesMarcus Arendt
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09Update primary bootstrapMarcus Arendt
2014-12-09erts: Allow cpu_timestamp tracing for LinuxLukas Larsson
2014-12-09Merge branch 'maint'Hans Nilsson
2014-12-09Merge remote-tracking branch 'upstream/master'Hans Nilsson
2014-12-09Merge remote-tracking branch 'upstream/maint' into maintHans Nilsson
2014-12-09Merge branch 'maint'Hans Nilsson
2014-12-09Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09Merge branch 'marcus/revert-ssh-testcase/OTP-12004' into maintMarcus Arendt
2014-12-09revert ssh testcaseMarcus Arendt