diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-18 09:46:01 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-18 09:46:01 +0100 |
| commit | 588c6e983f7b30f2a3da92b227d69e2c2fd3d5ba (patch) | |
| tree | 9dd719002fa6dc372154c0adefe1855e55890616 /lib/ssh | |
| parent | c822f43f8ef220b5986d5f10dabc81a4c51f92ef (diff) | |
| parent | 64e585da09339be629f05195cfcff7b01dcb0497 (diff) | |
| download | otp-588c6e983f7b30f2a3da92b227d69e2c2fd3d5ba.tar.gz otp-588c6e983f7b30f2a3da92b227d69e2c2fd3d5ba.tar.bz2 otp-588c6e983f7b30f2a3da92b227d69e2c2fd3d5ba.zip | |
Merge branch 'maint-r15' into maint
* maint-r15:
Update release notes
vsn -> 1.3.1
Update appup
Traffic suite comments plus a minor match tweak
Add a testcase
Reverse swapped arguments
Prepare release
Fixed syntax appup ssh
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 6ba32e018f..d99931c746 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,28 +19,14 @@ {"%VSN%", [ - {<<"2.1.1">>, [{restart_application, ssh}]}, - {<<"2.1">>, [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, - {load_module, ssh_connection, soft_purge, soft_purge, []}, - {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, - {load_module, ssh_auth, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_channel, soft_purge, soft_purge, []}, - {load_module, ssh_file, soft_purge, soft_purge, []}]}, - {load_module, ssh, soft_purge, soft_purge, []}]}, + {<<"2.1.1">>, [{restart_application, ssh}]}, + {<<"2.1">>, [{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} ], [ {<<"2.1.1">>, [{restart_application, ssh}]}, - {<<"2.1">>,[{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, - {load_module, ssh_connection, soft_purge, soft_purge, []}, - {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, - {load_module, ssh_auth, soft_purge, soft_purge, []}, - {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, - {load_module, ssh_channel, soft_purge, soft_purge, []}, - {load_module, ssh_file, soft_purge, soft_purge, []}]}, - {load_module, ssh, soft_purge, soft_purge, []}]}, + {<<"2.1">>,[{restart_application, ssh}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} ] |