aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-11-12Merge branch 'maint'Marcus Arendt
2014-11-12Merge branch 'dotsimon/ssh_connect_timeout/OTP-12306' into maintMarcus Arendt
* dotsimon/ssh_connect_timeout/OTP-12306: Fix ssh_sftp:start_channel timeout
2014-11-12Merge branch 'maint'Bruce Yinhe
2014-11-12Merge branch 's1n4/zlib_doc_typo' into maintBruce Yinhe
* s1n4/zlib_doc_typo: Fix a typo in the zlib documentation
2014-11-11Merge branch 'maint'Peter Andersson
2014-11-11Merge branch 'peppe/test_server/erl2html2_macro_problems' into maintPeter Andersson
* peppe/test_server/erl2html2_macro_problems: Update test_server app file Make sure code links are generated even if undefined macros exist OTP-11766
2014-11-11Merge branch 'siri/gen_server/try-catch/OTP-12263' into maintSiri Hansen
* siri/gen_server/try-catch/OTP-12263: Add stack trace for gen_server exit in ERROR REPORT
2014-11-11Merge branch 'siri/ct_telnet/no-newline/OTP-12252' into maintSiri Hansen
* siri/ct_telnet/no-newline/OTP-12252: [ct] Add 'newline' option to send functions in ct_telnet
2014-11-11Merge branch 'maint'Magnus Lidén
2014-11-11Merge branch 'mange/doc_inet/OTP-12296' into maintMagnus Lidén
* mange/doc_inet/OTP-12296: Update documentation for buffer options
2014-11-10Merge branch 'capflam/remove_empty_parts_in_binary_split'Bruce Yinhe
OTP-12301 * capflam/remove_empty_parts_in_binary_split: Add 'trim_all' option to binary:split/3
2014-11-10Merge branch 'maint'Marcus Arendt
2014-11-10Merge branch 'maint-r16' into maintMarcus Arendt
2014-11-10Fix a typo in the zlib documentationSina Samavati
2014-11-10Merge branch 'maint'Bruce Yinhe
2014-11-10Merge branch 'vinoski/dirty-nif-return-gc' into maintBruce Yinhe
OTP-12300 * vinoski/dirty-nif-return-gc: Fix gc-related problem with dirty NIFs
2014-11-07Add stack trace for gen_server exit in ERROR REPORTSiri Hansen
If a callback function was terminated with exit/1, there would be no stack trace in the ERROR REPORT produced by gen_server. This has been corrected. The actual exit reason for the process is not changed.
2014-11-07Merge branch 'bjorn/compiler/v3_core-type-fix'Björn Gustavsson
* bjorn/compiler/v3_core-type-fix: Extract annotations from filter qualifiers in a type-friendly way
2014-11-07[ct] Add 'newline' option to send functions in ct_telnetSiri Hansen
ct_telnet by default adds a newline to all command strings before sending to the telnet server. In some situations this is not desired, for example when sending telnet command sequences (prefixed with the Interprete As Command, IAC, character). In such cases, the new option can be used. Example - send an Are Your There (AYT) sequence: ct_telnet:send(Connection, [255,246], [{newline,false}]).
2014-11-07Merge branch 'maint'Bruce Yinhe
2014-11-07Merge branch 'lemenkov/expose_nif_version' into maintBruce Yinhe
OTP-12298 * lemenkov/expose_nif_version: Expose NIF version
2014-11-07Update documentation for buffer optionsMagnus Lidén
2014-11-07Merge branch 'maint'Bruce Yinhe
2014-11-07Merge branch 'jmrepetti/maint' into maintBruce Yinhe
* jmrepetti/maint: Section reference number incorrect
2014-11-06Merge branch 'siri/sasl/delete_module/OTP-11540'Siri Hansen
* siri/sasl/delete_module/OTP-11540: [sasl] Remove undocumented upgrade instruction
2014-11-06Merge branch 'siri/sup-spec-maps/OTP-11043'Siri Hansen
* siri/sup-spec-maps/OTP-11043: Update emacs skeleton for supervisor to use maps Update dialyzer test with maps in supervisor properties Add documentation of maps in supervisor flags and child specs Add test of maps in supervisor flags and child specs New function supervisor:get_childspec/2 Allow maps for supervisor flags and child specs Rebase supervisor Add more tests of supervisor
2014-11-06Update emacs skeleton for supervisor to use mapsSiri Hansen
The example in the skeleton now uses maps instead of the old tuple format for supservisor flags and child specifications.
2014-11-06Update dialyzer test with maps in supervisor propertiesSiri Hansen
After introducing maps for supervisor flags and child specs two tests in behaviour_SUITE started failing: behaviour_SUITE:custom_sup - failed because the type of the Period (MaxT) property had been changed (corrected) from non_neg_integer() to pos_integer() in the specification of the init callback in supervisor.erl behaviour_SUITE:supervisor_incorrect_return - same as above, plus the introduction of #{} as possible value for the supervisor flags and child_specs.
2014-11-06Add documentation of maps in supervisor flags and child specsSiri Hansen
2014-11-06Add test of maps in supervisor flags and child specsSiri Hansen
2014-11-06Merge branch 'maint'Marcus Arendt
2014-11-06Merge branch 'vinoski/fix-smp-disable-with-ds/OTP-12295' into maintMarcus Arendt
* vinoski/fix-smp-disable-with-ds/OTP-12295: Fix "-smp disable" for emulator with dirty schedulers
2014-11-06Merge branch 'maint'Bruce Yinhe
2014-11-06Merge branch 'dcy/maint' into maintBruce Yinhe
* dcy/maint: fix doc for maps:with/2
2014-11-05Merge branch 'lukas/erts/crash_dump_shell_info/OTP-12292'Lukas Larsson
* lukas/erts/crash_dump_shell_info/OTP-12292: erts: Print that we are crashdumping earlier
2014-11-05Merge branch 'maint'Lukas Larsson
* maint: erts: Fix hanging in fd_stop on windows
2014-11-05Merge branch 'lukas/erts/win32-flush-block/OTP-12291' into maintLukas Larsson
* lukas/erts/win32-flush-block/OTP-12291: erts: Fix hanging in fd_stop on windows
2014-11-05Merge branch 'maint'Marcus Arendt
Conflicts: erts/vsn.mk
2014-11-05Merge branch 'maint-17' into maintMarcus Arendt
Conflicts: OTP_VERSION
2014-11-05Merge branch 'maint'Lukas Larsson
* maint: erts: Fix ub in list_to_integer and bignum div
2014-11-05Merge branch 'lukas/erts/fix_undefined_behaviour/OTP-12290' into maintLukas Larsson
* lukas/erts/fix_undefined_behaviour/OTP-12290: erts: Fix ub in list_to_integer and bignum div
2014-11-05Merge branch 'maint'Lukas Larsson
* maint: erts: getsockname is not allowed on non-bound sockets
2014-11-05Merge branch 'lukas/erts/fdopen_non_bound_win32_fix/OTP-12289' into maintLukas Larsson
* lukas/erts/fdopen_non_bound_win32_fix/OTP-12289: erts: getsockname is not allowed on non-bound sockets
2014-11-05Update test_server app filePeter Andersson
2014-11-05Section reference number incorrectjmrepetti
2014-11-04Fix gc-related problem with dirty NIFsSteve Vinoski
Ensure that the return value from a dirty NIF call is made part of the GC rootset. Add a new regression test to nif_SUITE. Thanks to Daniel Goertzen for reporting the error and providing a test case, and to Sverker Eriksson for making test case reproducible and finding the fix.
2014-11-04Merge branch 'maint'Ingela Anderton Andin
2014-11-04Merge branch 'ia/ssh/rekeying-typo/OTP-12277' into maintIngela Anderton Andin
* ia/ssh/rekeying-typo/OTP-12277: ssh: Correct typo of renegotiate that could cause rekeying to fail
2014-11-04Updated OTP versionOTP-17.3.4Erlang/OTP
2014-11-04Prepare releaseErlang/OTP