aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
AgeCommit message (Collapse)Author
2015-02-05Merge branch 'maint'Hans Nilsson
* maint: Fix ssh:connect erroneus error msg at timeout
2015-02-05Fix ssh:connect erroneus error msg at timeoutHans Nilsson
2015-01-26Merge branch 'maint'Ingela Anderton Andin
2015-01-26Merge branch 'ia/ssh/sftp-v3-flags' into maintIngela Anderton Andin
* ia/ssh/sftp-v3-flags: ssh: Add some more flags ssh: Correct Sftp flag handling ssh: Add handling of sftp v3 flags
2015-01-23Merge branch 'maint'Marcus Arendt
2015-01-23ssh: Add some more flagsIngela Anderton Andin
2015-01-23ssh: Correct Sftp flag handlingIngela Anderton Andin
Function name was somewhat confusing and when trying to find a better name for it we realised it did not work as intended.
2015-01-23ssh: Add handling of sftp v3 flagsIngela Anderton Andin
2015-01-19fix spellingMarcus Arendt
2015-01-14Merge branch 'maint'Marcus Arendt
2015-01-13fix doc typos found by Rabbe FogelholmMarcus Arendt
2014-12-29Merge branch 'lemenkov/use_os_getenv_2'Marcus Arendt
* lemenkov/use_os_getenv_2: fix missing include Start using os:getenv/2 fun Introduce os:getenv/2
2014-12-19fix missing includeMarcus Arendt
2014-12-17Merge branch 'maint'Ingela Anderton Andin
2014-12-17ssh: Improve errorhandling in ssh_connection.erlIngela Anderton Andin
If a channel is closed by the peer while using a function with call semantics in ssh_connection.erl return {error, closed}. Document that the functions can return {error, timeout | closed} and not only ssh_request_status()
2014-12-17Merge branch 'maint'Marcus Arendt
2014-12-17Merge branch 'marcus/revert-ssh-testcase2/OTP-12004' into maintMarcus Arendt
* marcus/revert-ssh-testcase2/OTP-12004: fix failed conflict resolution
2014-12-15Start using os:getenv/2 funPeter Lemenkov
See #535 Signed-off-by: Peter Lemenkov <[email protected]>
2014-12-10Merge tag 'OTP-17.4'Marcus Arendt
=== OTP-17.4 === Changed Applications: - asn1-3.0.3 - common_test-1.9 - compiler-5.0.3 - crypto-3.4.2 - debugger-4.0.2 - dialyzer-2.7.3 - diameter-1.8 - edoc-0.7.16 - eldap-1.1 - erl_docgen-0.3.7 - erl_interface-3.7.20 - erts-6.3 - eunit-2.2.9 - hipe-3.11.2 - inets-5.10.4 - jinterface-1.5.12 - kernel-3.1 - megaco-3.17.3 - mnesia-4.12.4 - observer-2.0.3 - odbc-2.10.22 - otp_mibs-1.0.10 - parsetools-2.0.12 - percept-0.8.10 - runtime_tools-1.8.15 - snmp-5.1.1 - ssh-3.1 - ssl-5.3.8 - stdlib-2.3 - syntax_tools-1.6.17 - test_server-3.7.2 - tools-2.7.1 - wx-1.3.2 Unchanged Applications: - cosEvent-2.1.15 - cosEventDomain-1.1.14 - cosFileTransfer-1.1.16 - cosNotification-1.1.21 - cosProperty-1.1.17 - cosTime-1.1.14 - cosTransactions-1.2.14 - et-1.5 - gs-1.5.16 - ic-4.3.6 - orber-3.7.1 - os_mon-2.3 - ose-1.0.2 - public_key-0.22.1 - reltool-0.6.6 - sasl-2.4.1 - typer-0.9.8 - webtool-0.8.10 - xmerl-1.3.7 Conflicts: OTP_VERSION erts/vsn.mk
2014-12-10fix failed conflict resolutionMarcus Arendt
2014-12-09Prepare releaseErlang/OTP
2014-12-09Merge remote-tracking branch 'upstream/master'Hans Nilsson
2014-12-09Merge remote-tracking branch 'upstream/maint' into maintHans Nilsson
2014-12-09Merge branch 'maint'Hans Nilsson
2014-12-09ssh: Fix syntax error in .appupHans Nilsson
2014-12-09Merge branch 'maint'Marcus Arendt
2014-12-09revert ssh testcaseMarcus Arendt
2014-12-08Merge branch 'maint'Hans Nilsson
2014-12-08ssh: Fix .app and .appupHans Nilsson
2014-12-05Merge branch 'maint'Marcus Arendt
2014-12-05Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."Marcus Arendt
This reverts commit d086394ebd3595d431835af80709977a6c1c7c89.
2014-12-02Merge branch 'maint'Ingela Anderton Andin
2014-12-02ssh: Add soft upgrade for ptty_allocIngela Anderton Andin
2014-12-02Merge branch 'maint'Hans Nilsson
2014-12-02ssh: Fixes wrong version in appup fileHans Nilsson
2014-12-01Merge branch 'maint'Hans Nilsson
* maint: ssh: prepares appup file for release
2014-12-01ssh: prepares appup file for releaseHans Nilsson
2014-12-01Merge branch 'maint'Hans Nilsson
2014-12-01ssh: Implements and tests erl_tar read from remote host.Hans Nilsson
2014-12-01ssh: crypto framework for ssh_sftp:open_tar addedHans Nilsson
2014-12-01Merge branch 'maint'Ingela Anderton Andin
2014-12-01Merge branch 'ia/ssh/gracefull-termination/OTP-12185' into maintIngela Anderton Andin
* ia/ssh/gracefull-termination/OTP-12185: ssh: Gracefully handle bad input
2014-11-18ssh: Gracefully handle bad inputIngela Anderton Andin
2014-11-18Merge branch 'maint'Hans Nilsson
2014-11-18ssh: update vsn.mkHans Nilsson
2014-11-18ssh: Add ssh_sftp:open_tar/3,4 which opens a tar file at the server side of ↵Hans Nilsson
a channel. Depends on erl_tar.erl having the function erl_tar:init/3 defined.
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-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