aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
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-24Merge branch 'maint'Hans Nilsson
2015-11-24Merge branch 'hans/ssh/fd_more/OTP-12966' into maintHans Nilsson
2015-11-24Merge branch 'maint'Hans Nilsson
2015-11-24Merge branch 'hans/ssh/aes_gcm_crypto/OTP-13018' into maintHans Nilsson
2015-11-24Merge branch 'maint'Zandra
2015-11-24Merge branch 'tuncer/musl' into maintZandra
2015-11-24Merge branch 'maint'Zandra
2015-11-24Merge branch 'legoscia/tls-dist-shutdown' into maintZandra
2015-11-23Merge branch 'np/sharing-preserved-copy/OTP-12590'Björn-Egil Dahlberg
2015-11-23ssh: fix dialyzer reported errorHans Nilsson
2015-11-23ssh: renegotiate test group for AES_GCMHans Nilsson
2015-11-23ssh: documentation updatesHans Nilsson
2015-11-23ssh: AEAD_AES_(128|256)_GCM and aes(128|256)[email protected] cryptoHans Nilsson
2015-11-23ssh: refactor packet receptionHans Nilsson
2015-11-23Merge branch 'maint'Dan Gudmundsson
2015-11-23Merge branch 'dgud/erts/fix-mixed-msys-cygwin' into maintDan Gudmundsson
2015-11-23Merge branch 'maint'Björn-Egil Dahlberg
2015-11-23Merge branch 'egil/18/fix-maps-binary_to_term/OTP-13125' into maintBjörn-Egil Dahlberg
2015-11-20erts: More testcases for map binary_to_term/1Björn-Egil Dahlberg
2015-11-20erts: Fix maps decode in erlang:binary_to_term/1Björn-Egil Dahlberg
2015-11-20Merge branch 'maint'Björn Gustavsson
2015-11-20Merge branch 'bjorn/compiler/fix-missing-filename/OTP-13113' into maintBjörn Gustavsson
2015-11-20Fix missing filename and line number in warningBjörn Gustavsson
2015-11-20ssh: testcases for starting daemon with given fdHans Nilsson
2015-11-20Merge branch 'maint'Ingela Anderton Andin
2015-11-20Merge branch 'ia/ssl/tls-client-hello-version/OTP-13114' into maintIngela Anderton Andin
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'weisslj/fix-inets-crash-on-invalid-chunk-size' into maintZandra
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'weisslj/allow-whitespace-after-chunk-size' into maintZandra
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'riverrun/maint' into maintZandra
2015-11-20Merge branch 'maint'Zandra
2015-11-20Merge branch 'lrascao/fix/vm_crash_on_init_restart' into maintZandra
2015-11-19Refactor have seq_trace token testBjörn-Egil Dahlberg
2015-11-19Update primary bootstrapBjörn Gustavsson
2015-11-19Merge branch 'bjorn/cleanup'Björn Gustavsson
2015-11-19ssh: Make it possible for more than one daemon started with option fdHans Nilsson
2015-11-18Use sharing preserving copy error messages and exceptionsBjörn-Egil Dahlberg
2015-11-18Use sharing preserving copy in enif_make_copyBjörn-Egil Dahlberg
2015-11-18Refactor sharing preserved copy flagsBjörn-Egil Dahlberg
2015-11-18Fix rebase of SHCOPY seq_tokensBjörn-Egil Dahlberg
2015-11-18Merge branch 'maint'Björn Gustavsson
2015-11-18Merge branch 'bjorn/erts/erl_prim_loader-doc/OTP-13102' into maintBjörn Gustavsson