diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-29 12:08:09 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-07-29 12:08:09 +0200 |
| commit | f657d903027bb5fe2edfde2ba804e3579f4b87be (patch) | |
| tree | 29f5f1222f00ec4debe930a5d94ce4cf1d6ae3a4 /lib/ssl/test/openssl_alpn_SUITE.erl | |
| parent | 2c6cb235988654e5dc2924829b1fa8bbf539ed0c (diff) | |
| parent | 95305983f417cdcd15129d0c5fe786aeb2f9e42a (diff) | |
| download | otp-f657d903027bb5fe2edfde2ba804e3579f4b87be.tar.gz otp-f657d903027bb5fe2edfde2ba804e3579f4b87be.tar.bz2 otp-f657d903027bb5fe2edfde2ba804e3579f4b87be.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/openssl_alpn_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/openssl_alpn_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl index fa095b4bdb..1e8912be7d 100644 --- a/lib/ssl/test/openssl_alpn_SUITE.erl +++ b/lib/ssl/test/openssl_alpn_SUITE.erl @@ -59,8 +59,8 @@ groups() -> {'tlsv1.2', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}, {'tlsv1.1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}, {'tlsv1', [], alpn_tests() ++ alpn_npn_coexist() ++ rengotiation_tests()}, - {'dtlsv1.2', [], alpn_tests() ++ alpn_npn_coexist()}, - {'dtlsv1', [], alpn_tests() ++ alpn_npn_coexist()} + {'dtlsv1.2', [], alpn_tests()}, + {'dtlsv1', [], alpn_tests()} ]; false -> [ |