Automatic merge of jdk:master into master

duke · duke · commit 20e4e8b5cf51 · 2021-12-07T19:28:38.000Z
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -833,6 +833,8 @@ jdk/jfr/api/consumer/streaming/TestLatestEvent.java             8268297 windows-
 
 # jdk_jpackage
 
+tools/jpackage/share/MultiNameTwoPhaseTest.java 8278233 macosx-x64
+
 ############################################################################
 
 # Client manual tests
