aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2014-01-28fixes problem with ODBC on OS X 10.9 Mavericksconscell
2014-01-28Merge branch 'ia/tuncer/dialyzer-fixes/OTP-11627'Ingela Anderton Andin
2014-01-28Fix incorrect type reference (inet:ipaddress() -> inet:ip_address())Tuncer Ayaz
2014-01-28Consistently format public_key(3)Tuncer Ayaz
2014-01-28Fix incorrect use of public_key:private_key/0 typeTuncer Ayaz
2014-01-28Fix incorrect proplists type referenceTuncer Ayaz
2014-01-28Merge branch 'bjorn/on_load-documentation/OTP-11611'Björn Gustavsson
2014-01-28Merge branch 'vinoski/rm-drv-async-cancel'Rickard Green
2014-01-28Merge branch 'anders/diameter/doc/OTP-11583'Anders Svensson
2014-01-28Merge branch 'dgud/misc'Dan Gudmundsson
2014-01-28Fix MacOSX build instructionsDan Gudmundsson
2014-01-28Merge branch 'kostis/dialyzer_dep-spec-fix'Hans Bolinder
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-28Correct doc on the setting of Origin-State-IdAnders Svensson
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 'lukas/erts/cerl_R17_to_17_fixes/OTP-11615'Lukas Larsson
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-28Merge branch 'master' of super:otpIngela Anderton Andin
2014-01-27Merge branch 'sverk/crypto-process-slaughter'Sverker Eriksson
2014-01-27Merge branch 'sverk/misc-bug-fixes'Sverker Eriksson
2014-01-27Merge branch 'egil/gc-increase-tenure-rate/OTP-11617'Björn-Egil Dahlberg
2014-01-27vsn -> 1.6Anders Svensson
2014-01-27Remove upgrade-related codeAnders Svensson
2014-01-27Update appup for 17.0Anders Svensson
2014-01-27Merge branch 'lukas/17/docfixes/OTP-11613'Lukas Larsson
2014-01-27Avoid type gen_sctp:open_option() until it actually existsAnders Svensson
2014-01-27Merge branch 'rickard/load_balance/OTP-11385'Rickard Green
2014-01-27Fix usage of non-empty run-queue flagRickard Green
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 'lukas/17/docfixes/OTP-11613'Lukas Larsson
2014-01-27system: Fix documentation typoesLukas 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-27Merge branch 'bjorn/compiler/fix-crash/OTP-11610'Björn Gustavsson
2014-01-27Update the note for -on_load()Björn Gustavsson
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