aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
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-01inets: proper stop for httpc_handler K-A queue failureKirilll Zaborsky
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-31mnesia: don't delete log file on emfile errorMikael Pettersson
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
2015-05-29Update orddict with parameterized types and specsUENISHI Kota
2015-05-29Merge branch 'saleyn/sasl/opening-modes/OTP-12778'Björn Gustavsson
2015-05-29Merge branch 'legoscia/dialyzer/cache-hipe-binaries/OTP-12779'Björn Gustavsson
2015-05-29Merge branch 'bjorn/megaco/eliminate-now'Björn Gustavsson
2015-05-29Merge branch 'bjorn/et/eliminate-now-warnings/OTP-12780'Björn Gustavsson
2015-05-29syntax_tools app file: Update dependenciesBjörn Gustavsson
2015-05-28erts: Cleanup fsummary lines in erl_nif docsSverker Eriksson
2015-05-28erts: Fix alphabetic order in erl_nif docSverker Eriksson
2015-05-28erts: Add docs for map functions in nif APISverker Eriksson
2015-05-28kernel: Relax gen_tcp_misc_SUITE don't wait for timeoutBjörn-Egil Dahlberg
2015-05-28kernel: Relax test gen_tcp_misc_SUITE:wrapping_oct/1Björn-Egil Dahlberg
2015-05-28Typo 'asynchroneous' fixKirilll Zaborsky
2015-05-28Merge branch 'richcarl/warnings-by-default/OTP-12781'Björn-Egil Dahlberg