diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-12-02 16:10:18 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-12-02 16:10:18 +0100 |
| commit | 5e44955a84b20b6c832b8a90b9965a655f54a056 (patch) | |
| tree | 0d41348491913d9bf4cfb36dd0435a5727ea4a9e | |
| parent | 99ef4e5e667f151e0284653fc112f9b55f10a3da (diff) | |
| parent | d3b33e7c9c2885ac864ef67b7ff741ce433cbf22 (diff) | |
| download | otp-5e44955a84b20b6c832b8a90b9965a655f54a056.tar.gz otp-5e44955a84b20b6c832b8a90b9965a655f54a056.tar.bz2 otp-5e44955a84b20b6c832b8a90b9965a655f54a056.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 014363e3f1..70f1cc487c 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,7 +19,8 @@ {"%VSN%", [ - {"3.0.8", [{load_module, ssh_sftp, soft_purge, soft_purge, [erl_tar,ssh_xfer]}, + {"3.0.8", [{load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]}, + {load_module, ssh_sftp, soft_purge, soft_purge, [erl_tar,ssh_xfer]}, {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, {load_module, ssh, soft_purge, soft_purge, [ssh_connection_handler]}, {load_module, ssh_xfer, soft_purge, soft_purge, []} @@ -47,7 +48,8 @@ {<<".*">>, [{restart_application, ssh}]} ], [ - {"3.0.8", [{load_module, ssh_sftp, soft_purge, soft_purge, []}, + {"3.0.8", [{load_module, ssh_connection, soft_purge, soft_purge, [ssh_connection_handler]}, + {load_module, ssh_sftp, soft_purge, soft_purge, []}, {load_module, ssh_connection_handler, soft_purge, soft_purge, []}, {load_module, ssh, soft_purge, soft_purge, []}, {load_module, ssh_xfer, soft_purge, soft_purge, []} |