aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Expand)Author
2015-12-04Merge branch 'maint'Zandra
2015-12-04Merge branch 'zandra/rm-eunit-assertReceive' into maintZandra
2015-12-03Merge branch 'maint'Björn Gustavsson
2015-12-03Merge branch 'bjorn/asn1/empty-named-bit-string/OTP-13149' into maintBjörn Gustavsson
2015-12-03Merge branch 'maint'Siri Hansen
2015-12-03Merge branch 'siri/ct_netconfc/log-silent/OTP-13035' into maintSiri Hansen
2015-12-03rm assertReceive, due to a leftover of a conflict resolutionZandra
2015-12-03Merge branch 'maint'Zandra
2015-12-03Merge branch 'swvist/topic/ssh-key-callback-options' into maintZandra
2015-12-02Merge branch 'maint'Raimo Niskanen
2015-12-02Merge branch 'soranoba/fix-file-position/PR-646' into maintRaimo Niskanen
2015-12-02Merge branch 'maint'Siri Hansen
2015-12-02Merge branch 'siri/ct_netconfc/clear-timer/OTP-13008' into maintSiri Hansen
2015-12-01Support SSH key callback module optionsVipin Nair
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'legoscia/tls_dist_options' into maintZandra
2015-12-01Merge branch 'lexmag/bin-gen-pattern-bytes'Zandra
2015-12-01Merge branch 'maint'Zandra
2015-12-01Merge branch 'scrapinghub/sni_with_connect' into maintZandra
2015-12-01Merge branch 'maint'Ingela Anderton Andin
2015-12-01Merge branch 'ia/inets/esi-timeout/OTP-13110' into maintIngela Anderton Andin
2015-11-30BER: Fix encoding of empty named BIT STRINGBjörn Gustavsson
2015-11-27inets: Add warning header in "chunk trailer" when mod_esi callback times out ...Ingela Anderton Andin
2015-11-27inets: Remove exit that generates an incorrect internal server errorIngela Anderton Andin
2015-11-27Merge branch 'maint'Hans Nilsson
2015-11-27Merge branch 'maint-18' into maintHans Nilsson
2015-11-27Forbid bytes modifier for unsized part of binary generatorAleksei Magusev
2015-11-27inets: SNI to be passed with requests through CONNECTKirilll Zaborsky
2015-11-27Merge branch 'maint'Hans Bolinder
2015-11-27stdlib: Fix the shell command rp and pretty-printingHans Bolinder
2015-11-26Merge branch 'maint'Hans Nilsson
2015-11-26Merge branch 'hans/ssh/optimize_sftp_window_handling/OTP-13130' into maintHans Nilsson
2015-11-26Update release notesErlang/OTP
2015-11-26ssh: vsn.mk updatedHans Nilsson
2015-11-26ssh: New test cases for SSH_MSG_KEX_DH_GEX_REQUEST_OLDHans Nilsson
2015-11-26ssh: update existing testcasesHans Nilsson
2015-11-26ssh: Improve group selectionHans Nilsson
2015-11-26ssh: implemented server side SSH_MSG_KEX_DH_GEX_REQUEST_OLD for putty clientHans Nilsson
2015-11-26Merge branch 'maint'Zandra
2015-11-26Merge branch 'legoscia/ssl_connection_terminate_crash' into maintZandra
2015-11-26Merge branch 'maint'Zandra
2015-11-26Merge branch 'legoscia/tls_dist_nodelay' into maintZandra
2015-11-26Merge branch 'maint'Zandra
2015-11-26Merge branch 'legoscia/ssl-dist-error-handling' into maintZandra
2015-11-26Merge branch 'maint'Zandra
2015-11-26Merge branch 'zandra/fix-24h-macro-in-suite' into maintZandra
2015-11-26Merge branch 'maint'Zandra
2015-11-26Merge branch 'ppikula/fix-24h-macro' into maintZandra
2015-11-26Unify internal error handlingRaimo Niskanen
2015-11-26Fix file:pread and :pwrite to use character encodingRaimo Niskanen