diff options
author | Bruce Yinhe <[email protected]> | 2014-10-15 10:13:27 +0200 |
---|---|---|
committer | Bruce Yinhe <[email protected]> | 2014-10-15 10:13:27 +0200 |
commit | f5b344378128831127026b3e18154fdf23d4713c (patch) | |
tree | 0efdb3e0b76d47fceffa39c9e632e02ef2818257 /lib/ssh/src/ssh.appup.src | |
parent | 56daa687a24a26ab08434c68ca172d5bd31cfdf7 (diff) | |
parent | 5d49d05c3604f764736b10cfb287818d4b41efda (diff) | |
download | otp-f5b344378128831127026b3e18154fdf23d4713c.tar.gz otp-f5b344378128831127026b3e18154fdf23d4713c.tar.bz2 otp-f5b344378128831127026b3e18154fdf23d4713c.zip |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
-rw-r--r-- | lib/ssh/src/ssh.appup.src | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 1917c95f5a..3cafe2d6be 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,9 +19,19 @@ {"%VSN%", [ + {"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]}, {<<".*">>, [{restart_application, ssh}]} ], [ + {"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]}]}, {<<".*">>, [{restart_application, ssh}]} ] }. |