diff options
author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:53:12 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:53:12 +0200 |
commit | 56e08cb2d1faa279961413729e48ef1f3275a575 (patch) | |
tree | d3bea204f76c2202090f1b500c9d47c4fca661ed /lib/ssh/src | |
parent | c095c23a9d0e07ecde8c1ca7ad24ffb9f2ca3182 (diff) | |
parent | 6166867da5cbfe97b09cddf2e079178a2e959c44 (diff) | |
download | otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.gz otp-56e08cb2d1faa279961413729e48ef1f3275a575.tar.bz2 otp-56e08cb2d1faa279961413729e48ef1f3275a575.zip |
Merge branch 'ia/public_key/crypto/prepare-for-release' into maint
* ia/public_key/crypto/prepare-for-release:
public_key & ssl: Add ASN-1 dependency
crypto & public_key: prepare for release
Diffstat (limited to 'lib/ssh/src')
-rw-r--r-- | lib/ssh/src/ssh.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 3a7aa79d16..7d5478c3f6 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -41,11 +41,13 @@ %%-------------------------------------------------------------------- start() -> application:start(crypto), + application:start(asn1), application:start(public_key), application:start(ssh). start(Type) -> application:start(crypto, Type), + application:start(asn1), application:start(public_key, Type), application:start(ssh, Type). |