diff options
author | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2013-06-10 14:54:04 +0200 |
commit | a60a923d6ad01029494dfad34685983426b75093 (patch) | |
tree | 6b73a6f5f9ecaac82c784345daf1a11055bcbd78 /lib/ssl/test/ssl_npn_handshake_SUITE.erl | |
parent | e6c7db595f50ae0606b3177451bcfcdc28f9d3c0 (diff) | |
parent | 56e08cb2d1faa279961413729e48ef1f3275a575 (diff) | |
download | otp-a60a923d6ad01029494dfad34685983426b75093.tar.gz otp-a60a923d6ad01029494dfad34685983426b75093.tar.bz2 otp-a60a923d6ad01029494dfad34685983426b75093.zip |
Merge remote-tracking branch 'upstream/maint'
Diffstat (limited to 'lib/ssl/test/ssl_npn_handshake_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_npn_handshake_SUITE.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl index 7b271c4d5d..30c0a67a36 100644 --- a/lib/ssl/test/ssl_npn_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_npn_handshake_SUITE.erl @@ -69,7 +69,6 @@ init_per_suite(Config) -> catch crypto:stop(), try crypto:start() of ok -> - application:start(public_key), ssl:start(), Result = (catch make_certs:all(?config(data_dir, Config), |