diff options
| author | Erlang/OTP <[email protected]> | 2013-03-08 14:49:03 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-03-08 14:49:03 +0100 |
| commit | 79719be40f24b300d85735629c26db73c2d603a1 (patch) | |
| tree | d43b182a4ecd3942638bc0acf4caf5a077ea368f /lib/ssh/src/ssh.appup.src | |
| parent | cad57e4df850d64587759d951af501fb210e499f (diff) | |
| parent | 2a2fa47f14a69ea49709552196db61df971e0a2d (diff) | |
| download | otp-79719be40f24b300d85735629c26db73c2d603a1.tar.gz otp-79719be40f24b300d85735629c26db73c2d603a1.tar.bz2 otp-79719be40f24b300d85735629c26db73c2d603a1.zip | |
Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into maint-r16
* ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714:
ssh: Prepare for upcoming release
ssh: Test and enhance handling of nonexistent subsystem
Prepare release
Fixed rekeying initiation and secured testcase
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 3 |
1 files changed, 2 insertions, 1 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}]}, |