aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-06-05Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-06-05Merge branch 'ia/ssl/dumb-clients/OTP-11969' into maintIngela Anderton Andin
2014-06-05Merge branch 'maint'Lukas Larsson
2014-06-05Merge branch 'lukas/erts/fix_trace_on_registered_procs/OTP-11968' into maintLukas Larsson
2014-06-05erts: tracing on send now works for registered processesLukas Larsson
2014-06-04Merge branch 'maint'Sverker Eriksson
2014-06-04Merge branch 'sverk/crypto-leaking-hmac/OTP-11953' into maintSverker Eriksson
2014-06-04Merge branch 'maint'Marcus Arendt
2014-06-04Merge branch 'scrapinghub/stream_body_with_no_content_length' into maintMarcus Arendt
2014-06-04Merge branch 'maint'Marcus Arendt
2014-06-04Merge branch 'mikpe/openfile-dont-use-undefined-statbuf' into maintMarcus Arendt
2014-06-04Merge branch 'RoadRunnr/ssl/fix-tests' into maintMarcus Arendt
2014-06-04Merge branch 'maint'Marcus Arendt
2014-06-04Merge branch 'fenek/fix/vstudio_macro' into maintMarcus Arendt
2014-06-04Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-06-04Merge branch 'ia/ssl/default-ciphers/OTP-11966' into maintIngela Anderton Andin
2014-06-03ssl: Workaround that gen_fsm does not call CB:format_status when CB:terminateIngela Anderton Andin
2014-06-03erts: Fixup for gdb command etp-cp-1Sverker Eriksson
2014-06-03Merge branch 'maint'Lukas Larsson
2014-06-03Merge branch 'lukas/erts/git_vsn_script_fix/OTP-11961' into maintLukas Larsson
2014-06-03erts: Fix git version scriptLukas Larsson
2014-06-03SSL: always filter the full list of supported ciphers against the supported a...Andreas Schultz
2014-06-03Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-06-03Merge branch 'ia/ssl/prep-release' into maintIngela Anderton Andin
2014-06-03Merge branch 'maint'Hans Bolinder
2014-06-03Merge branch 'hb/dialyzer/correct_docs' into maintHans Bolinder
2014-06-03[dialyzer] Correct docs about optionsHans Bolinder
2014-05-29Merge branch 'maint'Anders Svensson
2014-05-29Merge branch 'anders/diameter/17.1/OTP-11943' into maintAnders Svensson
2014-05-29Merge branch 'anders/diameter/dictionaries/OTP-11958' into maintAnders Svensson
2014-05-29Fix broken check for undefined AVPs in @codec and @custom_typesAnders Svensson
2014-05-29Add @codecs and @custom_types tests to compiler suiteAnders Svensson
2014-05-29Update appup for OTP-11958: dictionary compilationAnders Svensson
2014-05-28Merge branch 'sverk/etp-cp-fix' into maintSverker Eriksson
2014-05-28erts: Fix bug in gdb function etp-cp-1Sverker Eriksson
2014-05-28SSL: fix OpenSSL known renegotiation bug detectionAndreas Schultz
2014-05-28SSL: in tests, filter ssl client ciphers for version compatibilityAndreas Schultz
2014-05-28Merge branch 'maint'Siri Hansen
2014-05-28Merge branch 'siri/cdv-timer-reg-proc/OTP-11919' into maintSiri Hansen
2014-05-28ssl: Filter default ciphers for supported Crypto algorihmsIngela Anderton Andin
2014-05-28ssl: Prepare for releaseIngela Anderton Andin
2014-05-28Merge remote-tracking branch 'upstream/maint'Ingela Anderton Andin
2014-05-28Merge branch 'ia/ssl/improved-options-handling/OTP-11950' into maintIngela Anderton Andin
2014-05-28Merge branch 'maint'Anders Svensson
2014-05-28Merge branch 'anders/diameter/17.1/OTP-11943' into maintAnders Svensson
2014-05-28Merge branch 'anders/diameter/hardening/OTP-11721' into maintAnders Svensson
2014-05-28Update appup for OTP-11946, OTP-11936: 5014, Failed-AVP decodeAnders Svensson
2014-05-28Update appup for OTP-11938: terminate watchdog after DPR receptionAnders Svensson
2014-05-28Update appup for OTP-11721: log and counter hardeningAnders Svensson
2014-05-27Merge branch 'maint'Ingela Anderton Andin