aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-10-16 09:23:40 +0200
committerHans Nilsson <[email protected]>2014-10-16 09:23:40 +0200
commit8c4f92263793b5900490fdd4ad2673fd06398381 (patch)
tree7f0da9ce11f07ab4067f4268c6e1bd18bf6bdf28
parent7b2760a6f9991d754687a81c51410c2282ff0b07 (diff)
parenta5d35e280ffdf64501465f0dd42fca5d3d207c08 (diff)
downloadotp-8c4f92263793b5900490fdd4ad2673fd06398381.tar.gz
otp-8c4f92263793b5900490fdd4ad2673fd06398381.tar.bz2
otp-8c4f92263793b5900490fdd4ad2673fd06398381.zip
Merge branch 'maint'
* maint: ssh: Fixes clause syntax error in ssh.appup.src
-rw-r--r--lib/ssh/src/ssh.appup.src4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 3cafe2d6be..42603cc23c 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -22,8 +22,8 @@
{"3.0.6", [{load_module, ssh_auth, soft_purge, soft_purge, [ssh_connection_handler]},
{load_module, ssh_message, soft_purge, soft_purge, [ssh_connection_handler]},
{load_module, ssh_io, soft_purge, soft_purge, [ssh_connection_handler]},
- {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]}]},
- {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_sftp, soft_purge, soft_purge, [ssh_connection_handler]},
+ {load_module, ssh_xfer, soft_purge, soft_purge, [ssh_connection_handler]}]},
{<<".*">>, [{restart_application, ssh}]}
],
[