aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-06-21Merge branch 'hans/ssh/sftp_ver4_xfer/ERIERL-199/OTP-15149' into maint-20Erlang/OTP
* hans/ssh/sftp_ver4_xfer/ERIERL-199/OTP-15149: ssh: Fix ssh_xfer decode_ATTR error for Vsn=4
2018-06-21Merge branch 'hans/ssh/sftp_error_codes/ERIERL-194/OTP-15148' into maint-20Erlang/OTP
* hans/ssh/sftp_error_codes/ERIERL-194/OTP-15148: ssh: Report the signal name if there is an exit-signal to sftpd ssh: Bug fix sftp error codes
2018-06-21Merge branch 'hasse/syntax_tools/fix_map_type/OTP-15098/ERIERL-177' into ↵Erlang/OTP
maint-20 * hasse/syntax_tools/fix_map_type/OTP-15098/ERIERL-177: syntax_tools: Fix a bug regarding reverting map types.
2018-06-21Merge branch 'hans/ftp/socket_opts/ERIERL-192/OTP-15120' into maint-20Erlang/OTP
* hans/ftp/socket_opts/ERIERL-192/OTP-15120: ftp: Disallow 'packet_size' for low-level options ftp: Socket options
2018-06-21Merge branch 'maint'Sverker Eriksson
this should be an empty merge commit
2018-06-21Update pre-push hook after OTP-21 releaseSverker Eriksson
(same as 7d1b8752a7a0cd66de6b3625b3b1f7afccb6147a)
2018-06-21Update pre-push hook after OTP-21 releaseSverker Eriksson
Copy to .git/hooks/pre-push to activate.
2018-06-21Fix environment case sensitivity issues on WindowsJohn Högberg
2018-06-21ssh: Report the signal name if there is an exit-signal to sftpdHans Nilsson
2018-06-21ssh: Bug fix sftp error codesHans Nilsson
Report the signal name if the signal error message is "" Do not report a return code of 0 as an error.
2018-06-21Merge branch 'henrik/update-OTP_VERSION'Henrik Nord
* henrik/update-OTP_VERSION: update for 22
2018-06-21update for 22Henrik Nord
2018-06-20Update system_info doc to include ets_countArtur Cygan
2018-06-20Use bif for other ets tables countingArtur Cygan
2018-06-20Use bif for counting ets tables in observer backendArtur Cygan
2018-06-20Merge branch 'maint'Lukas Larsson
* maint: travis: Enable docs deploy for all branches
2018-06-20travis: Enable docs deploy for all branchesLukas Larsson
2018-06-20Merge branch 'maint'Lukas Larsson
* maint: travis: Enable delivery of docs
2018-06-20travis: Enable delivery of docsLukas Larsson
2018-06-20ssh: Fix ssh_xfer decode_ATTR error for Vsn=4Hans Nilsson
2018-06-20Merge branch 'hans/ftp/socket_opts/ERIERL-192/OTP-15120' into ↵Hans Nilsson
hans/ftp/21socket_opts/ERIERL-192/OTP-15120 Conflicts: lib/ftp/src/ftp.erl
2018-06-20Merge branch 'maint'Lukas Larsson
* maint: erts: Update etp-commands with correct aux_flags
2018-06-20Merge branch 'lukas/erts/etp-aux-work-fixes' into maintLukas Larsson
* lukas/erts/etp-aux-work-fixes: erts: Update etp-commands with correct aux_flags
2018-06-19ftp: Disallow 'packet_size' for low-level optionsHans Nilsson
2018-06-19erl_interface: Fix simultaneous connection setupSverker Eriksson
by also accepting status "ok_simultaneous".
2018-06-19Merge branch 'maint'Lukas Larsson
* maint: travis: Update deploy security token
2018-06-19travis: Update deploy security tokenLukas Larsson
2018-06-19Updated OTP versionOTP-21.0Erlang/OTP
2018-06-19Prepare releaseErlang/OTP
2018-06-18ftp: Socket optionsHans Nilsson
2018-06-18travis: Don't run docs deploy scriptLukas Larsson
Need to create a seperate repo first for this to push to.
2018-06-18Merge branch 'lukas/travis/deploy'Lukas Larsson
* lukas/travis/deploy: Add deploy stage to travis-ci
2018-06-18erts: Update etp-commands with correct aux_flagsLukas Larsson
2018-06-18Add deploy stage to travis-ciLukas Larsson
2018-06-18Merge remote-tracking branch 'origin/henrik/Update-copyright'Henrik Nord
* origin/henrik/Update-copyright: Update copyright year
2018-06-18Update copyright yearHenrik Nord
2018-06-18Merge branch 'ingela/ssl/doc-fix-21'Ingela Anderton Andin
* ingela/ssl/doc-fix-21: ssl: Document enhancements
2018-06-18ssl: Document enhancementsIngela Anderton Andin
2018-06-18Merge branch 'lukas/erts/fix_vxworks_configure'Lukas Larsson
* lukas/erts/fix_vxworks_configure: erts: Fix vxworks configure broken by corba removal
2018-06-18erts: Fix vxworks configure broken by corba removalLukas Larsson
2018-06-18Update preloaded modulesHenrik Nord
2018-06-18Update primary bootstrapHenrik Nord
2018-06-15support key without value in query stringTristan Sloughter
2018-06-15Merge branch 'sverker/macos-select-fd-bug'Sverker Eriksson
* sverker/macos-select-fd-bug: erts: Fix MacOS pollset bug
2018-06-15Merge branch 'lukas/otp_mibs/deprecate/OTP-15141'Lukas Larsson
* lukas/otp_mibs/deprecate/OTP-15141: Update primary bootstrap Deprecate otp_mibs
2018-06-15Merge branch 'siri/logger-fix'Siri Hansen
* siri/logger-fix: [logger] Update documentation [logger] Adjust priority settings in test [logger] Unregister handler names before terminating [logger] Stress overload_kill tests in disk_log handler
2018-06-15[logger] Update documentationSiri Hansen
2018-06-15[logger] Adjust priority settings in testSiri Hansen
Now only setting high priority on every second burst sending process, to allow for handler process to be scheduled in every now and then.
2018-06-15[logger] Unregister handler names before terminatingSiri Hansen
2018-06-15[logger] Stress overload_kill tests in disk_log handlerSiri Hansen