Merge
authorduke
Wed, 05 Jul 2017 19:41:01 +0200
changeset 24388 7d9006b484bd
parent 24387 d122674e5ed7 (diff)
parent 24386 0cf8e525ed4f (current diff)
child 24390 cfe99e4d318b
Merge
jdk/src/share/classes/jdk/internal/util/xml/BasicXmlPropertiesProvider.java
jdk/src/share/classes/sun/util/spi/XmlPropertiesProvider.java
jdk/src/share/classes/sun/util/xml/META-INF/services/sun.util.spi.XmlPropertiesProvider
jdk/src/share/classes/sun/util/xml/PlatformXmlPropertiesProvider.java
jdk/src/solaris/classes/java/lang/UNIXProcess.java.aix
jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd
jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux
jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris
jdk/test/java/util/Properties/CustomProvider.java
jdk/test/java/util/Properties/MyXmlPropertiesProvider.java
--- a/jaxp/.hgtags	Wed Jul 05 19:40:57 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 19:41:01 2017 +0200
@@ -255,3 +255,4 @@
 4ce98701efe3b28f6ce3ab23385445731e968af7 jdk9-b10
 6b4280dceb00642f54d5bc1c2cb7d34c99a04992 jdk9-b11
 e88cecf5a21b760ff7d7761c2db6bb8c82bc9f0c jdk9-b12
+5eaf717f6e36037a6d3744ffeee0e4c88e64a0d2 jdk9-b13