aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2015-06-04Merge branch 'egil/cuddle-tests'Björn-Egil Dahlberg
2015-06-04erts: Remove remaining ?line macros in trace_meta_SUITEBjörn-Egil Dahlberg
2015-06-04erts: Relax trace_meta_SUITE:on_and_off_test/1Björn-Egil Dahlberg
2015-06-04erts: Remove ?line macro in trace_meta_SUITE:on_and_off_test/1Björn-Egil Dahlberg
2015-06-04kernel: Remove remaining ?line macros in gen_tcp_misc_SUITEBjörn-Egil Dahlberg
2015-06-04Update primary bootstrapBjörn Gustavsson
2015-06-04Merge branch 'bjorn/compiler/spurious-warning'Björn Gustavsson
2015-06-03Merge branch 'kostis/llvm-now'Henrik Nord
2015-06-03Merge branch 'scrapinghub/async-typo'Henrik Nord
2015-06-03Merge branch 'jh/freebsdcpu/OTP-12796'Björn-Egil Dahlberg
2015-06-02Merge branch 'nybek/fix_gen_tcp_shutdown'Zandra Hird
2015-06-02Merge branch 'josevalim/jv-annotate-form-type'Henrik Nord
2015-06-02Merge branch 'tombriden/handle_ssl_error'Henrik Nord
2015-06-02Merge branch 'weiss/propagate-setopt-error'Henrik Nord
2015-06-02Merge branch 'zandra/revert/saleyn/eunit'Zandra Hird
2015-06-02Merge branch 'richcarl/syntax_tools/add-merl/OTP-12769'Björn Gustavsson
2015-06-02restore broken fileHenrik Nord
2015-06-02os_mon: Comply with C89 standardBjörn-Egil Dahlberg
2015-06-02correct merge conflictHenrik Nord
2015-06-02Merge branch 'maint'Henrik Nord
2015-06-02Merge tag 'OTP-17.5.6' into maintHenrik Nord
2015-06-01Merge branch 'vinoski/enif-raise-exception/OTP-12770'Sverker Eriksson
2015-06-01Merge branch 'sverk/nif-map-docs'Sverker Eriksson
2015-06-01Updated OTP versionOTP-17.5.6Erlang/OTP
2015-06-01Update release notesErlang/OTP
2015-06-01Merge branch 'hans/ssh/codenomicon_degradation/OTP-12784' into maint-17Erlang/OTP
2015-06-01Merge branch 'ia/ssl/crypto-bad-input/OTP-12783' into maint-17Erlang/OTP
2015-06-01Merge branch 'ia/ssh/recvbuf/OTP-12782' into maint-17Erlang/OTP
2015-06-01Merge branch 'ia/inets/filter-headers/OTP-12776' into maint-17Erlang/OTP
2015-05-30Merge branch 'maint'Anders Svensson
2015-05-29ssl: Prepare for releaseIngela Anderton Andin
2015-05-29ssl: Correct handling of bad input to premaster_secret calculationIngela Anderton Andin
2015-05-29ssh: update ssh versionHans
2015-05-29ssh: Plain text message returned for invalid version exchangeHans
2015-05-29ssh: Implement keyboard_interactive on server sideHans
2015-05-29ssh: Check e and f parameters in kexdhHans Nilsson
2015-05-29ssh: Set max num algoritms in msg_kexinit negotiationHans
2015-05-29ssh: handle that inet:getopts(Socket, [recbuf]) may return {ok, []}Ingela Anderton Andin
2015-05-29inets: Prepare for releaseIngela Anderton Andin
2015-05-29inets: Add customize optionIngela Anderton Andin
2015-05-29Merge branch 'kostis/cerl_pmatch'Zandra Hird
2015-05-29Merge branch 'ethercrow/maint'Zandra Hird
2015-05-29Merge branch 'fishcakez/supervisor_ignore'Zandra Hird
2015-05-29Updated OTP versionOTP-17.5.5Erlang/OTP
2015-05-29Update release notesErlang/OTP
2015-05-29Merge branch 'anders/diameter/test/OTP-12767' into maint-17Erlang/OTP
2015-05-29Merge branch 'anders/diameter/17.5.5/OTP-12757' into maint-17Erlang/OTP
2015-05-29Merge branch 'anders/diameter/sctp/OTP-12744' into maint-17Erlang/OTP
2015-05-29Merge branch 'anders/diameter/counters/OTP-12741' into maint-17Erlang/OTP
2015-05-29Merge branch 'kuenishi/ku-orddict-typespec'Hans Bolinder