diff options
| author | Hans Nilsson <[email protected]> | 2014-12-08 14:12:30 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-12-08 14:12:30 +0100 |
| commit | 342bf3c6500770fdd9ef5862d87a28d350e91b4b (patch) | |
| tree | 48c336897e872267d69e3ce1807040570239e251 /lib/ssh | |
| parent | ccbbf5ae09286e71761b42a4b203384002997b84 (diff) | |
| parent | c7e5d33b782d72b9ac9150b1c99b758c7888d3f3 (diff) | |
| download | otp-342bf3c6500770fdd9ef5862d87a28d350e91b4b.tar.gz otp-342bf3c6500770fdd9ef5862d87a28d350e91b4b.tar.bz2 otp-342bf3c6500770fdd9ef5862d87a28d350e91b4b.zip | |
Merge branch 'hans/ssh/fix_app_appup' into maint
* hans/ssh/fix_app_appup:
ssh: Fix .app and .appup
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh.app.src | 2 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src index 4ad55b34ca..bc01c539e0 100644 --- a/lib/ssh/src/ssh.app.src +++ b/lib/ssh/src/ssh.app.src @@ -40,7 +40,7 @@ {applications, [kernel, stdlib, crypto, public_key]}, {env, []}, {mod, {ssh_app, []}}, - {runtime_dependencies, ["stdlib-2.0","public_key-0.22","kernel-3.0", + {runtime_dependencies, ["stdlib-2.3","public_key-0.22","kernel-3.0", "erts-6.0","crypto-3.3"]}]}. diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 70f1cc487c..8b2780259a 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -1,3 +1,4 @@ +bg %% -*- erlang -*- %% %CopyrightBegin% %% @@ -20,7 +21,7 @@ {"%VSN%", [ {"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_sftp, soft_purge, soft_purge, [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, []} |