diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-11 01:00:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-11 01:00:06 +0100 |
| commit | 0a02de62d1fe4341684df370242fd3aca3b21f9d (patch) | |
| tree | 393119de339401ac829a2ae27efae019f4541bdf /tests | |
| parent | fbc9fb233dfb1959924632b428048d5f6a3401d9 (diff) | |
| parent | c7f6761bc98593744f8f8f9d2b864656f8d36a58 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iecdf00ca61d819bde532daa42f093860ec4a499e
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network/ssl/qsslkey/BLACKLIST | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST index c0dfe5eb86..f9bc0af6de 100644 --- a/tests/auto/network/ssl/qsslkey/BLACKLIST +++ b/tests/auto/network/ssl/qsslkey/BLACKLIST @@ -1,2 +1,2 @@ -redhatenterpriselinuxworkstation-6.6 -rhel-7.4 +redhatenterpriselinuxworkstation +rhel |