diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-01 14:47:55 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-01 14:47:55 +0100 |
| commit | 81e432119a8f47226a4746322c64b0901e7817d9 (patch) | |
| tree | ab3564f98d6bf2cd89e194f6810effac9c0ee2d5 /lib/ssh/src | |
| parent | 8deb96fb1d017307e22d2ab88968b9ef9f1b71d0 (diff) | |
| parent | b51fde1cb2c6cdbc775e0ae9c669e76c83d28b78 (diff) | |
| download | otp-81e432119a8f47226a4746322c64b0901e7817d9.tar.gz otp-81e432119a8f47226a4746322c64b0901e7817d9.tar.bz2 otp-81e432119a8f47226a4746322c64b0901e7817d9.zip | |
Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into maint
* ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714:
ssh: Prepare for upcoming release
ssh: Ctify test doc
ssh: Test and enhance handling of nonexistent subsystem
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 3 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_sftp.erl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index c4b5aa256b..f4986410ab 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,6 +19,7 @@ {"%VSN%", [ + {<<"2.1.4">>, [{load_module, ssh_sftp, soft_purge, soft_purge, []}]}, {<<"2.1.3">>, [{restart_application, ssh}]}, {<<"2.1.2">>, [{restart_application, ssh}]}, {<<"2.1.1">>, [{restart_application, ssh}]}, @@ -27,7 +28,7 @@ {<<"1\\.*">>, [{restart_application, ssh}]} ], [ - {<<"2.1.3">>, [{restart_application, ssh}]}, + {<<"2.1.4">>, [{load_module, ssh_sftp, soft_purge, soft_purge, []}]}, {<<"2.1.2">>, [{restart_application, ssh}]}, {<<"2.1.1">>, [{restart_application, ssh}]}, {<<"2.1">>,[{restart_application, ssh}]}, diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl index f3afbe01bf..10167a9223 100644 --- a/lib/ssh/src/ssh_sftp.erl +++ b/lib/ssh/src/ssh_sftp.erl @@ -403,7 +403,7 @@ init([Cm, ChannelId, Timeout]) -> rep_buf = <<>>, inf = new_inf()}}; failure -> - {stop, {error, "server failed to start sftp subsystem"}}; + {stop, "server failed to start sftp subsystem"}; Error -> {stop, Error} end. |