aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-06-30Merge branch 'maint' to 'master'Sverker Eriksson
2015-06-30Merge branch 'sverk/ets-unfix-delete-race/OTP-12870' into maintSverker Eriksson
* sverk/ets-unfix-delete-race/OTP-12870: erts: Fix ETS race between object deleter and table unfixer
2015-06-30Merge branch 'maint' to 'master'Sverker Eriksson
2015-06-30Merge branch 'sverk/map-merge-trap' into maintSverker Eriksson
* sverk/map-merge-trap: erts: Expand test map_SUITE:t_bif_merge_and_check
2015-06-30Merge branch 'maint'Sverker Eriksson
Conflicts: OTP_VERSION
2015-06-30Merge branch 'maint-18' into maintSverker Eriksson
2015-06-30Merge branch 'maint'Hans Nilsson
* maint: ssh: correct sftp unicode and iolist bug ssh: new unicode tests ssh: delete ssh_unicode_SUITE
2015-06-30Merge branch 'hans/ssh/sftp_iolist/OTP-12853' into maintHans Nilsson
* hans/ssh/sftp_iolist/OTP-12853: ssh: correct sftp unicode and iolist bug ssh: new unicode tests ssh: delete ssh_unicode_SUITE
2015-06-30ssh: correct sftp unicode and iolist bugHans Nilsson
Ssh_sftp.erl handled incorrectly unicode data in ssh_ftp:write_file. There was also problems with some deeper iolists.
2015-06-30ssh: new unicode testsHans Nilsson
2015-06-30ssh: delete ssh_unicode_SUITEHans Nilsson
The tests now have supersets in ssh_basic_SUITE and ssh_sftp_SUITE.
2015-06-30Updated OTP versionOTP-18.0.1Erlang/OTP
2015-06-30Prepare releaseErlang/OTP
2015-06-30Merge branch 'sverk/poll-lost-wakeup/OTP-12859' into maint-18Erlang/OTP
* sverk/poll-lost-wakeup/OTP-12859: erts: Fix race in poller thread wake up
2015-06-29Merge branch 'maint'Sverker Eriksson
2015-06-29Merge branch 'maint-17' into maintSverker Eriksson
Conflicts: OTP_VERSION erts/doc/src/notes.xml erts/vsn.mk otp_versions.table
2015-06-26erts: Fix ETS race between object deleter and table unfixerSverker Eriksson
causing the delete marked object to be left in the table after safe_fixtable(_,false) has returned. This is not super serious as the delete marked object is quite benign and will be deleted at the next unfix operation.
2015-06-25Updated OTP versionOTP-17.5.6.1Erlang/OTP
2015-06-25Prepare releaseErlang/OTP
2015-06-25Merge branch 'sverk/poll-lost-wakeup/OTP-12859' into maint-17Erlang/OTP
* sverk/poll-lost-wakeup/OTP-12859: erts: Fix race in poller thread wake up
2015-06-25Merge branch 'egil/fix-purge-literals/OTP-12821' into maint-17Erlang/OTP
* egil/fix-purge-literals/OTP-12821: erts: Fix garbage collect literals in code purge
2015-06-24Update OTP VersionHenrik Nord
2015-06-23Updated OTP versionOTP-18.0Erlang/OTP
2015-06-23Prepare releaseErlang/OTP
2015-06-23Merge branch 'ia/ssl/modern-timetrap'Ingela Anderton Andin
* ia/ssl/modern-timetrap: ssl: Make init functions fail if make_certs:all fails ssl: Avoid sleep ssl: modernize timetrap handling
2015-06-22erts: Fix race in poller thread wake upSverker Eriksson
2015-06-22Merge branch 'rickard/debug-fix/OTP-12650'Rickard Green
* rickard/debug-fix/OTP-12650: Fix node/dist refc count
2015-06-22Fix node/dist refc countRickard Green
2015-06-22erts: Expand test map_SUITE:t_bif_merge_and_checkSverker Eriksson
with merge of randomized maps.
2015-06-22ssl: Make init functions fail if make_certs:all failsIngela Anderton Andin
2015-06-22Merge branch 'vinoski/driver-doc-fix/OTP-12855'Rickard Green
* vinoski/driver-doc-fix/OTP-12855: Fix documentation of ERL_DRV_ERROR_ERRNO
2015-06-22ssl: Avoid sleepIngela Anderton Andin
When possible avoid sleep in test cases.
2015-06-22ssl: modernize timetrap handlingIngela Anderton Andin
Watchdog is legacy test_server use only ct:timetrap/1
2015-06-22Fix documentation of ERL_DRV_ERROR_ERRNOSteve Vinoski
2015-06-22Merge branch 'bruce/change-license'Bruce Yinhe
OTP-12845 * bruce/change-license: fix errors caused by changed line numbers Change license text to APLv2
2015-06-22Merge branch 'sverk/nosmp-init-timer-wheel'Sverker Eriksson
* sverk/nosmp-init-timer-wheel: erts: Fix timer wheel initialization bug for non smp
2015-06-22Merge branch 'egil/fix-erl_poll-darwin'Björn-Egil Dahlberg
* egil/fix-erl_poll-darwin: erts: Fix erl_poll on darwin
2015-06-22Merge branch 'kostis/hipe-no-dial-warnings'Henrik Nord
* kostis/hipe-no-dial-warnings: Eliminate a dialyzer warning Simplify handling of o2 and o3 option expansion
2015-06-22fix errors caused by changed line numbersBruce Yinhe
2015-06-22Merge branch 'hb/dialyzer/fix_opaque_types/OTP-12493'Hans Bolinder
* hb/dialyzer/fix_opaque_types/OTP-12493: dialyzer: Correction of last commit
2015-06-22dialyzer: Correction of last commitHans Bolinder
2015-06-22Merge branch 'anders/diameter/18/OTP-12588'Anders Svensson
* anders/diameter/18/OTP-12588: vsn -> 1.10 Remove dead upgrade-related code Update appup for 18 Fix release note typo Fix comment typo
2015-06-22Merge branch 'anders/diameter/sctp/OTP-12768'Anders Svensson
* anders/diameter/sctp/OTP-12768: Fix connection timeouts in test transports Fix start order of alternate transports Log discarded answers Ensure accepting processes are first in, first out Remove upgrade-related code Be less parallel in traffic suite Increase send/receive buffers for testsuite SCTP listeners Decrease unnecessarily long testsuite timetraps Simplify accepting transport start Simplify peeloff signaling Simplify socket close at terminate Don't monitor listener after peeloff Don't receive initial messages out of order Remove assumption that SCTP association ids will be unique
2015-06-22Merge branch 'anders/diameter/grouped_errors/OTP-12721'Anders Svensson
* anders/diameter/grouped_errors/OTP-12721: Fix decode of Grouped AVPs containing errors Simplify logic Simplify logic
2015-06-21Fix connection timeouts in test transportsAnders Svensson
Without a timeout, TCP/SCTP connect can take some time to fail, which resulted in failures in the pool suite after the parent commit fixed the previously faulty sctp-first-then-tcp connect.
2015-06-21Fix start order of alternate transportsAnders Svensson
A transport configured with diameter:add_transport/2 can be passed multiple transport_module/transport_config tuples in order to specify alternate configuration, modules being attempted in order until one succeeds. This is primarily for the connecting case, to allow a transport to be configured to first attempt connection over SCTP, and then TCP in case SCTP fails, with configuration like that documented: {transport_module, diameter_sctp}, {transport_config, [...], 5000}, {transport_module, diameter_tcp}, {transport_config, [...]} If the options are the same in both cases, another possibility would be configuration like this, which attaches the same transport_config to both modules: {transport_module, diameter_sctp}, {transport_module, diameter_tcp}, {transport_config, [...], 5000}, However, in this case the start order was reversed relative to the documented order: first tcp, then sctp. This commit restores the intended order. OTP-12851
2015-06-20vsn -> 1.10Anders Svensson
2015-06-20Remove dead upgrade-related codeAnders Svensson
Not needed with the parent commit's restart_application.
2015-06-20Log discarded answersAnders Svensson
To diameter_lib:log/4, which was last motivated in commit 39acfdb0.
2015-06-20erts: Fix erl_poll on darwinBjörn-Egil Dahlberg