aboutsummaryrefslogtreecommitdiffstats
path: root/lib
AgeCommit message (Expand)Author
2014-01-28Merge branch 'master' of super:otpMicael Karlberg
2014-01-28Merge branch 'bmk/snmp/prep_for_r17'Micael Karlberg
2014-01-28Merge branch 'bmk/megaco/prep_for_r17'Micael Karlberg
2014-01-28Merge branch 'nox/export_all-behaviour'Hans Bolinder
2014-01-28Merge branch 'rzezeski/rz_fix_dtrace_illumos/OTP-11622'Lukas Larsson
2014-01-28Merge branch 'ia/ssl/tests'Ingela Anderton Andin
2014-01-28Merge branch 'anders/diameter/17.0_release/OTP-11605'Anders Svensson
2014-01-28Merge branch 'ia/Vagabond/adt-honor-cipher-order/OTP-11621'Ingela Anderton Andin
2014-01-27Merge branch 'sverk/crypto-process-slaughter'Sverker Eriksson
2014-01-27vsn -> 1.6Anders Svensson
2014-01-27Remove upgrade-related codeAnders Svensson
2014-01-27Update appup for 17.0Anders Svensson
2014-01-27Avoid type gen_sctp:open_option() until it actually existsAnders Svensson
2014-01-27[megaco] Updated version, appup and release notesMicael Karlberg
2014-01-27[snmp] Assigned proper version, updated release notes and appupMicael Karlberg
2014-01-2717.0 anchor and broken links fixesLukas Larsson
2014-01-27Merge branch 'lukas/erts/sendfile_passive_mode_fix/OTP-11614'Lukas Larsson
2014-01-27erts: fix bug when using passive mode and sendfileLukas Larsson
2014-01-27Merge branch 'dgud/wx/refactor-and-bugfixes/OTP-11586'Dan Gudmundsson
2014-01-27Merge branch 'anders/diameter/sctp_streams/OTP-11593'Anders Svensson
2014-01-27Merge branch 'anders/diameter/undefined_group/OTP-11561'Anders Svensson
2014-01-27ssl: Avoid test case timing issuesIngela Anderton Andin
2014-01-24beam_except: Eliminate compiler crashBjörn Gustavsson
2014-01-24Change interface for communicating outbound stream id to diameter_sctpAnders Svensson
2014-01-24Merge branch 'andrewtj/atj-crypto-chiphertext-typo'Henrik Nord
2014-01-24Merge branch 'oliv3/fix_valgrind_warning_in_gen_challenge'Henrik Nord
2014-01-24Merge tag 'OTP_R16B03-1'Magnus Lidén
2014-01-24Prepare releaseOTP_R16B03-1Erlang/OTP
2014-01-24Merge branch 'maint'Ingela Anderton Andin
2014-01-24Merge branch 'ia/ssl/secure-renegotiate/OTP-11595' into maintIngela Anderton Andin
2014-01-23wx: Delay all deletes if recursed in event loopDan Gudmundsson
2014-01-23Merge branch 'lucafavatella/fix-doc-of-dbg-stop'Henrik Nord
2014-01-23Merge branch 'vinoski/emacs-fixes'Henrik Nord
2014-01-23Properly handle export_all when looking for undefined callbacksAnthony Ramine
2014-01-22wx: wx could hang if wxe_server died (or had died) when inside a callbackDan Gudmundsson
2014-01-22wx: Delay memory cleanup until safeDan Gudmundsson
2014-01-22Merge branch 'bjorn/erts/zlib-1.2.8'Björn Gustavsson
2014-01-22Merge branch 'bjorn/asn1/optimizations/OTP-11573'Björn Gustavsson
2014-01-22ssl: Incorrect inputed cipherlist lead server to think that the clientIngela Anderton Andin
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-skel-indent' into vinoski...Dan Gudmundsson
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-sexp-error' into vinoski/...Dan Gudmundsson
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-fun-arity' into vinoski/e...Dan Gudmundsson
2014-01-22Merge remote-tracking branch 'vinoski/vinoski/emacs-error-fixes' into vinoski...Dan Gudmundsson
2014-01-22Merge branch 'dgud/test_unicode/OTP-10877'Dan Gudmundsson
2014-01-21Implement 'honor_cipher_order' SSL server-side optionAndrew Thompson
2014-01-21Merge branch 'hans/ssh/unicode/OTP-10953'Hans Nilsson
2014-01-21ssh: prepare vsn.mk for releaseHans Nilsson
2014-01-21ssh: minor doc correction about unicodeHans Nilsson
2014-01-21Merge branch 'maint'Magnus Lidén
2014-01-21Smoke test erl_syntax:revert/1Anthony Ramine