diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-12-02 16:09:28 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-12-02 16:09:28 +0100 |
| commit | d3b33e7c9c2885ac864ef67b7ff741ce433cbf22 (patch) | |
| tree | 4305830b7f8d5e7b3477eb49d53021beecbeb4af /lib | |
| parent | a48e4e2d7775ad34f980a1f17e270e5d9232add3 (diff) | |
| parent | 95995ef984af43bd3cd0b1a4797e69538de2a26d (diff) | |
| download | otp-d3b33e7c9c2885ac864ef67b7ff741ce433cbf22.tar.gz otp-d3b33e7c9c2885ac864ef67b7ff741ce433cbf22.tar.bz2 otp-d3b33e7c9c2885ac864ef67b7ff741ce433cbf22.zip | |
Merge branch 'ia/ssh/prepare-for-release' into maint
* ia/ssh/prepare-for-release:
ssh: Add soft upgrade for ptty_alloc
Diffstat (limited to 'lib')
| -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, []} |