aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2015-12-07Merge branch 'maint'Ingela Anderton Andin
2015-12-07Merge branch 'ia/ssl/sslv3-completeness' into maintIngela Anderton Andin
2015-12-07ssl: SSLv3 completenessIngela Anderton Andin
2015-12-07Merge branch 'maint'Björn Gustavsson
2015-12-07Merge branch 'bjorn/stdlib/rand-export_seed/OTP-13162' into maintBjörn Gustavsson
2015-12-07Correct rand:export_seed/0 when there is no prior seedBjörn Gustavsson
2015-12-07Merge branch 'maint'Ingela Anderton Andin
2015-12-07Merge branch 'ia/ssl/max-sessions/OTP-12392' into maintIngela Anderton Andin
2015-12-07ssl: Fix documentation mistakesIngela Anderton Andin
2015-12-07Merge branch 'maint'Hans Nilsson
2015-12-07Merge branch 'hans/ssh/pref_public_key_algs/OTP-13158' into maintHans Nilsson
2015-12-07Merge branch 'maint'Hans Bolinder
2015-12-07Merge branch 'hb/stdlib/type_printing/OTP-13084' into maintHans Bolinder
2015-12-07doc: Fix some minor issues in Types and Function SpecificationsHans Bolinder
2015-12-07erts: Remove CDATA from The Abstract Format documentHans Bolinder
2015-12-07erts: Correct the types section in The Abstract Format documentHans Bolinder
2015-12-07stdlib: Correct pretty-printing of map typesHans Bolinder
2015-12-07stdlib: Pretty-print constraints as 'V :: T'Hans Bolinder
2015-12-04ssh: tests skips if not supported cryptoHans Nilsson
2015-12-04ssh: ssh_auth checks support for user pubkey algHans Nilsson
2015-12-04Merge branch 'maint'Henrik Nord
2015-12-04Merge branch 'maint-17' into maintHenrik Nord
2015-12-04Merge branch 'maint'Lars Thorsen
2015-12-04Merge branch 'lars/xmllint-incorrect-errors/OTP-13026' into maintLars Thorsen
2015-12-04Merge branch 'maint'Dan Gudmundsson
2015-12-04Merge branch 'dgud/wx/rewrite-cmd-loop/OTP-13160' into maintDan Gudmundsson
2015-12-04Merge branch 'maint'Björn Gustavsson
2015-12-04Merge branch 'bjorn/stdlib/fix-erl_lint-bugs/OTP-13157' into maintBjörn Gustavsson
2015-12-04Merge branch 'maint'Zandra
2015-12-04Merge branch 'zandra/rm-eunit-assertReceive' into maintZandra
2015-12-04Merge branch 'maint'Zandra
2015-12-04Merge branch 'mikpe/hipe_x86_signal-musl-support' into maintZandra
2015-12-03ssh: client pub key opt implementedHans Nilsson
2015-12-03ssh: client pub key testcaseHans Nilsson
2015-12-03ssh: client pub key documentationHans Nilsson
2015-12-03wx: Fix some function specificationsDan Gudmundsson
2015-12-03ssl: Add upper limit for session cacheIngela Anderton Andin
2015-12-03ssl: Measure elapsed time with erlang:monotonic_timeIngela Anderton Andin
2015-12-03Extend erl_lint:format_error/1 to handle bittype mismatchesBjörn Gustavsson
2015-12-03erl_lint_SUITE: Add smoke test of format_error/1Björn Gustavsson
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-03Updated OTP versionOTP-17.5.6.5Erlang/OTP
2015-12-03Prepare releaseErlang/OTP
2015-12-03Merge branch 'ia/ssl/maint-17/backport-of-18-fix' into maint-17Erlang/OTP
2015-12-03Merge branch 'raimo/inet-setopts-multi-raw/OTP-11482' into maint-17Erlang/OTP
2015-12-03ssl: Prepare for releaseIngela Anderton Andin
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