aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-11-16 11:00:16 +0100
committerFredrik Gustafsson <[email protected]>2012-11-16 11:00:16 +0100
commitd3ceb8f5194ff323971163d7758bcbbde74cd0ee (patch)
tree943830bb23512d59ef7149b24ddf722c1d297465 /lib/ssh/src
parent054ea4f360b2aaea2dc56fe70c9a6706c6494c71 (diff)
parent7e7d5d522f1a46d7bdda3980f6e9c5649a35eca6 (diff)
downloadotp-d3ceb8f5194ff323971163d7758bcbbde74cd0ee.tar.gz
otp-d3ceb8f5194ff323971163d7758bcbbde74cd0ee.tar.bz2
otp-d3ceb8f5194ff323971163d7758bcbbde74cd0ee.zip
Merge branch 'maint'
* maint: Appup changes for SSH
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh.appup.src10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 8914aeffdb..6ba32e018f 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,10 +19,7 @@
{"%VSN%",
[
- {<<"2.1.1">>, [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
- {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
- {load_module, ssh_auth, soft_purge, soft_purge, []},
- {load_module, ssh, soft_purge, soft_purge, []}]},
+ {<<"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, []},
@@ -35,10 +32,7 @@
{<<"1\\.*">>, [{restart_application, ssh}]}
],
[
- {<<"2.1.1">>, [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
- {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
- {load_module, ssh_auth, soft_purge, soft_purge, []},
- {load_module, ssh, soft_purge, soft_purge, []}]},
+ {<<"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, []},