# HG changeset patch
# User lana
# Date 1459439993 25200
# Node ID dfc85e3e7c4e9b85471124a297b0b9e5cb5bcc72
# Parent  f7cc867f39d498a6e8a99f28d8a300df96eece9d# Parent  91782cb54d73f9e784ca9df685c2244f26ebb1c1
Merge

diff -r f7cc867f39d4 -r dfc85e3e7c4e jaxp/test/ProblemList.txt
--- a/jaxp/test/ProblemList.txt	Thu Mar 31 01:13:23 2016 -0700
+++ b/jaxp/test/ProblemList.txt	Thu Mar 31 08:59:53 2016 -0700
@@ -23,4 +23,6 @@
 #
 ###########################################################################
 
-# No jaxp tests are on the problem list.
+# 8147431 
+javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh            generic-all
+
diff -r f7cc867f39d4 -r dfc85e3e7c4e jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh
--- a/jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh	Thu Mar 31 01:13:23 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh	Thu Mar 31 08:59:53 2016 -0700
@@ -25,6 +25,7 @@
 # @bug 8077931
 # @summary This case tests if the properties FILES, DEFER, PREFER, RESOLVE in
 #          jaxp.properties and system properties could be used.
+# @key intermittent
 # @library ../../libs/
 # @build catalog.CatalogTestUtils
 # @build PropertiesTest