diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:26 +0200 |
| commit | e027c7241f073f5fc8c1db88700cc83635b6454f (patch) | |
| tree | 69920e408b5eeb1547c0241696cfa845af85e4be /tests/auto/network/ssl | |
| parent | b2035d38e8dfdfe2ba8da96df5c1174f01dfbb5b (diff) | |
| parent | 3b85d53913741660473dbc242a48c2ee65d51421 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0120f804522c0c652e9537b6e9fe08189f071ed2
Diffstat (limited to 'tests/auto/network/ssl')
| -rw-r--r-- | tests/auto/network/ssl/qsslkey/BLACKLIST | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index a08e1f35eb..c0dfe5eb86 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -1 +1,2 @@ -linux +redhatenterpriselinuxworkstation-6.6 +rhel-7.4 |