diff options
| author | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
| commit | 3536111957c809976ed3e7091e85960990be904d (patch) | |
| tree | aafc4cf4f996ece272e6b9c3d2366061c34f08da /lib/ssh/src/ssh.appup.src | |
| parent | a7c0e439ee84d25ce18f65959be06315063a7de8 (diff) | |
| parent | 0c09797c725c98e5466bf6c575b7be4f2fc0e813 (diff) | |
| download | otp-3536111957c809976ed3e7091e85960990be904d.tar.gz otp-3536111957c809976ed3e7091e85960990be904d.tar.bz2 otp-3536111957c809976ed3e7091e85960990be904d.zip | |
Merge remote branch 'upstream/dev' into dev
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]}]} ] }. |