diff options
| author | Niclas Eklund <[email protected]> | 2011-08-23 15:26:10 +0200 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-08-23 15:26:10 +0200 |
| commit | da62065765d3512afa793d64cdc96b6995526424 (patch) | |
| tree | 736a646bcf20b65e9f3b65c221598025b5e07faf /lib/ssh/src/ssh.appup.src | |
| parent | 6d698a28ecde4bfc2b4e749d7db2af2f48fc29f1 (diff) | |
| parent | b43386bc392859251fabc20c3ba12e275342333d (diff) | |
| download | otp-da62065765d3512afa793d64cdc96b6995526424.tar.gz otp-da62065765d3512afa793d64cdc96b6995526424.tar.bz2 otp-da62065765d3512afa793d64cdc96b6995526424.zip | |
Merge branch 'nick/ssh/stop_channel_tampers_with_trap_exit_flag/OTP-9386' into dev
* nick/ssh/stop_channel_tampers_with_trap_exit_flag/OTP-9386:
Corrected year in license header.
OTP-9386 - Calling ssh_sftp:stop_channel/1 resulted in that the trap_exit flag was set to true for the invoking process.
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 974145836c..150b7d86dd 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,13 +19,19 @@ {"%VSN%", [ - {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}]}, + {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]}, + {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, + {load_module, ssh_sftp, soft_purge, soft_purge, []}]}, {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, + {load_module, ssh_sftp, soft_purge, soft_purge, []}, {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]} ], [ - {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}]}, + {"2.0.7", [{load_module, ssh_sftp, soft_purge, soft_purge, []}]}, + {"2.0.6", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, + {load_module, ssh_sftp, soft_purge, soft_purge, []}]}, {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []}, + {load_module, ssh_sftp, soft_purge, soft_purge, []}, {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]} ] }. |