aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
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
2014-12-09Merge branch 'maint'Dan Gudmundsson
2014-12-09Merge branch 'dgud/debugger/still-invoked-gs-functions/OTP-12357' into maintDan Gudmundsson
2014-12-08eldap: Clarifies documentation for start_tls and searchHans Nilsson
2014-12-08Merge branch 'maint'Hans Nilsson
2014-12-08Merge branch 'hans/ssh/fix_app_appup' into maintHans Nilsson
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-08Merge branch 'maint'Rickard Green
2014-12-08Merge branch 'rickard/appup-files/OTP-12358' into maintRickard Green
2014-12-08Add .appup fileRickard Green
2014-12-08Merge branch 'maint'Rickard Green
2014-12-08Merge branch 'rickard/autoconf/OTP-12348' into maintRickard Green
2014-12-08Update megaco.appup.srcRickard Green
2014-12-08debugger: Do not use the old removed gs functionalityDan Gudmundsson
2014-12-05Merge branch 'egil/ets/use-internal-stack/OTP-12356'Björn-Egil Dahlberg
2014-12-05Merge branch 'maint'Marcus Arendt
2014-12-05Merge branch 'marcus/revert-ssh-fix/OTP-12004' into maintMarcus Arendt
2014-12-05Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt
2014-12-04erts: Start compilation of beam_emu earlierLukas Larsson
2014-12-03Merge branch 'maint'Rickard Green