aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-01-28Merge branch 'ia/conscell/odbc-mavericks/OTP-11630'Ingela Anderton Andin
* ia/conscell/odbc-mavericks/OTP-11630: fixes problem with ODBC on OS X 10.9 Mavericks
2014-01-28fixes problem with ODBC on OS X 10.9 Mavericksconscell
Since Apple has removed iODBC from the default OS X 10.9 Mavericks installation I tried to compile Erlang R16B02 with unixODBC. Even with installed unixODBC and specified --with-odbc=[path to my unixODBC] option Erlang R16B02 still uses iODBC (because Apple has left some iODBC binaries): 1> odbc:start(). ok 2> odbc:connect("",[]). {error,"[iODBC][Driver Manager]No data source or driver specified, dialog prohibited SQLSTATE IS: IM007 Connection to database failed."}
2014-01-28Merge branch 'master' of super:otpHans Nilsson
2014-01-28Merge branch 'hans/ssh/tty_geometry_delay/OTP-10732'Hans Nilsson
2014-01-28ssh: The server ssh_cli does not delay tty_geometry requests in case no tty ↵Hans Nilsson
is allocated
2014-01-28Merge branch 'ia/tuncer/dialyzer-fixes/OTP-11627'Ingela Anderton Andin
* ia/tuncer/dialyzer-fixes/OTP-11627: Fix incorrect type reference (inet:ipaddress() -> inet:ip_address()) Consistently format public_key(3) Fix incorrect use of public_key:private_key/0 type Fix incorrect proplists type reference
2014-01-28Fix incorrect type reference (inet:ipaddress() -> inet:ip_address())Tuncer Ayaz
2014-01-28Consistently format public_key(3)Tuncer Ayaz
When documenting public_key/0 and private_key/0, I noticed the inconsistent state of formatting in public_key(3)'s Data Types section. This should be fixed for consistency and readability.
2014-01-28Fix incorrect use of public_key:private_key/0 typeTuncer Ayaz
public_key:private_key/0 was referenced but undefined, and lib/ssl had a local definition of private_key/0. To fix that, make the following changes: * add public_key:private_key/0 type * document public_key/0 and private_key/0 * fix incorrect definitions and references
2014-01-28Fix incorrect proplists type referenceTuncer Ayaz
ssh and public_key were referring to proplists:proplists/0 which does not exist. Fix by using the correct type proplists:proplist/0.
2014-01-28Merge branch 'bjorn/on_load-documentation/OTP-11611'Björn Gustavsson
* bjorn/on_load-documentation/OTP-11611: Update the note for -on_load()
2014-01-28Merge branch 'vinoski/rm-drv-async-cancel'Rickard Green
OTP-11628 * vinoski/rm-drv-async-cancel: remove deprecated driver_async_cancel function
2014-01-28Merge branch 'anders/diameter/doc/OTP-11583'Anders Svensson
* anders/diameter/doc/OTP-11583: Correct doc on the setting of Origin-State-Id
2014-01-28Merge branch 'dgud/misc'Dan Gudmundsson
2014-01-28Fix MacOSX build instructionsDan Gudmundsson
Remove confusing and obsolete build instructions for Lion.
2014-01-28Merge branch 'kostis/dialyzer_dep-spec-fix'Hans Bolinder
* kostis/dialyzer_dep-spec-fix: Fix an erroneous spec
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
* nox/export_all-behaviour: Properly handle export_all when looking for undefined callbacks
2014-01-28Correct doc on the setting of Origin-State-IdAnders Svensson
It was incorrectly stated that the AVP would be set in an outgoing DPR/DPA.
2014-01-28Merge branch 'rzezeski/rz_fix_dtrace_illumos/OTP-11622'Lukas Larsson
* rzezeski/rz_fix_dtrace_illumos/OTP-11622: Fix DTrace build on Illumos
2014-01-28Merge branch 'ia/ssl/tests'Ingela Anderton Andin
* ia/ssl/tests: ssl: Avoid test case timing issues
2014-01-28Merge branch 'lukas/erts/cerl_R17_to_17_fixes/OTP-11615'Lukas Larsson
* lukas/erts/cerl_R17_to_17_fixes/OTP-11615: erts: fix unicode printing of gdb printouts cerl: Fix target detection on freebsd New version number does not start with an R
2014-01-28Merge branch 'anders/diameter/17.0_release/OTP-11605'Anders Svensson
* anders/diameter/17.0_release/OTP-11605: vsn -> 1.6 Remove upgrade-related code Update appup for 17.0 Avoid type gen_sctp:open_option() until it actually exists
2014-01-28Merge branch 'ia/Vagabond/adt-honor-cipher-order/OTP-11621'Ingela Anderton Andin
* ia/Vagabond/adt-honor-cipher-order/OTP-11621: Implement 'honor_cipher_order' SSL server-side option
2014-01-28Merge branch 'master' of super:otpIngela Anderton Andin
2014-01-27Merge branch 'sverk/crypto-process-slaughter'Sverker Eriksson
OTP-11619 * sverk/crypto-process-slaughter: crypto: Remove all processes from application crypto
2014-01-27Merge branch 'sverk/misc-bug-fixes'Sverker Eriksson
OTP-11618 * sverk/misc-bug-fixes: erts: Fix faulty assert in match spec engine. erts: Fix crash when comparing very large floats with integers erts: Refactor big-float compare on HALFWORD to use C-stack erts: Fix halfword compile errors in ESTACK
2014-01-27Merge branch 'egil/gc-increase-tenure-rate/OTP-11617'Björn-Egil Dahlberg
* egil/gc-increase-tenure-rate/OTP-11617: erts: Increase gc tenure rate
2014-01-27vsn -> 1.6Anders Svensson
2014-01-27Remove upgrade-related codeAnders Svensson
No longer needed to update code in runtime since the emulator is restarted at a major release.
2014-01-27Update appup for 17.0Anders Svensson
Plan to make use of the emulator restart implied by a major release to clean out some upgrade-related code.
2014-01-27Merge branch 'lukas/17/docfixes/OTP-11613'Lukas Larsson
* lukas/17/docfixes/OTP-11613: 17.0 anchor and broken links fixes
2014-01-27Avoid type gen_sctp:open_option() until it actually existsAnders Svensson
The type's existence is the subject of OTP-11139, which has been gathering dust since R16B. http://erlang.org/pipermail/erlang-bugs/2013-September/003765.html
2014-01-27Merge branch 'rickard/load_balance/OTP-11385'Rickard Green
* rickard/load_balance/OTP-11385: Fix usage of non-empty run-queue flag
2014-01-27Fix usage of non-empty run-queue flagRickard Green
2014-01-27[megaco] Updated version, appup and release notesMicael Karlberg
OTP-10907
2014-01-27[snmp] Assigned proper version, updated release notes and appupMicael Karlberg
OTP-10877 OTP-10907
2014-01-2717.0 anchor and broken links fixesLukas Larsson
2014-01-27Merge branch 'lukas/erts/sendfile_passive_mode_fix/OTP-11614'Lukas Larsson
* lukas/erts/sendfile_passive_mode_fix/OTP-11614: erts: fix bug when using passive mode and sendfile
2014-01-27erts: fix bug when using passive mode and sendfileLukas Larsson
The bug incorrectly issued driver_select when un-ignoring an fd for a socket in passive mode, which caused an incorrect error tuple to be returned when the remote end closed the connection.
2014-01-27Merge branch 'lukas/17/docfixes/OTP-11613'Lukas Larsson
* lukas/17/docfixes/OTP-11613: system: Fix documentation typoes
2014-01-27system: Fix documentation typoesLukas Larsson
2014-01-27Merge branch 'dgud/wx/refactor-and-bugfixes/OTP-11586'Dan Gudmundsson
* dgud/wx/refactor-and-bugfixes/OTP-11586: wx: Delay all deletes if recursed in event loop wx: wx could hang if wxe_server died (or had died) when inside a callback wx: Delay memory cleanup until safe wx: Refactor C++ code wx: Add init_dialog event Update icons wx: Update icons to plain old white ones
2014-01-27Merge branch 'anders/diameter/sctp_streams/OTP-11593'Anders Svensson
* anders/diameter/sctp_streams/OTP-11593: Change interface for communicating outbound stream id to diameter_sctp
2014-01-27Merge branch 'anders/diameter/undefined_group/OTP-11561'Anders Svensson
* anders/diameter/undefined_group/OTP-11561: Ensure that Grouped AVP's are fully defined in dictionaries Don't format diameter_make:codec/2 errors Compiler suite fix
2014-01-27Merge branch 'bjorn/compiler/fix-crash/OTP-11610'Björn Gustavsson
* bjorn/compiler/fix-crash/OTP-11610: beam_except: Eliminate compiler crash
2014-01-27Update the note for -on_load()Björn Gustavsson
We can't recommend -on_load() for general use.
2014-01-27ssl: Avoid test case timing issuesIngela Anderton Andin