diff options
| author | Erlang/OTP <[email protected]> | 2015-07-01 15:54:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-07-01 15:54:13 +0200 |
| commit | 73da9471177f9b5b67f063cd88f029f687864c50 (patch) | |
| tree | 2dde068635cccc4e7607c86092f581f2ebb94019 /lib/ssh/src/ssh.app.src | |
| parent | fb794658ae54b304219c907648f230decf10d622 (diff) | |
| parent | 85bf0f9627122416048e2fc9d102e76b84d36467 (diff) | |
| download | otp-73da9471177f9b5b67f063cd88f029f687864c50.tar.gz otp-73da9471177f9b5b67f063cd88f029f687864c50.tar.bz2 otp-73da9471177f9b5b67f063cd88f029f687864c50.zip | |
Merge branch 'ia/ssh/backport/OTP-12884' into maint-r15
* ia/ssh/backport/OTP-12884:
ssh: Fix test case issue
ssh: Use old crypto with newer ssh
Diffstat (limited to 'lib/ssh/src/ssh.app.src')
| -rw-r--r-- | lib/ssh/src/ssh.app.src | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src index 316c09eb06..74d7293be0 100644 --- a/lib/ssh/src/ssh.app.src +++ b/lib/ssh/src/ssh.app.src @@ -8,22 +8,24 @@ ssh_acceptor, ssh_acceptor_sup, ssh_auth, + ssh_message, ssh_bits, ssh_cli, + ssh_client_key_api, ssh_channel, ssh_channel_sup, ssh_connection, ssh_connection_handler, - ssh_connection_manager, ssh_connection_sup, + ssh_daemon_channel, ssh_shell, sshc_sup, sshd_sup, ssh_file, ssh_io, - ssh_key_api, ssh_math, ssh_no_io, + ssh_server_key_api, ssh_sftp, ssh_sftpd, ssh_sftpd_file, @@ -32,10 +34,9 @@ ssh_sup, ssh_system_sup, ssh_transport, - ssh_userreg, ssh_xfer]}, {registered, []}, - {applications, [kernel, stdlib, crypto]}, + {applications, [kernel, stdlib, crypto, public_key]}, {env, []}, {mod, {ssh_app, []}}]}. |