Merge
authorlana
Fri, 23 Aug 2013 14:14:05 -0700
changeset 19448 f7bcbf987d5c
parent 19353 ee92e7cf8d35 (diff)
parent 19447 f2da7f97e104 (current diff)
child 19450 e92c5abf8936
child 19595 4565983c4629
child 19779 fe0b98be61a0
child 20101 4d045bddfaa4
Merge
jdk/src/share/classes/com/sun/security/auth/PolicyParser.java
jdk/src/share/classes/com/sun/security/auth/SubjectCodeSource.java
jdk/src/share/classes/java/util/jar/UnsupportedProfileException.java
jdk/src/share/classes/sun/security/provider/ConfigSpiFile.java
jdk/test/java/net/URLClassLoader/profiles/Basic.java
jdk/test/java/net/URLClassLoader/profiles/Lib.java
jdk/test/java/net/URLClassLoader/profiles/basic.sh
jdk/test/tools/jar/AddAndUpdateProfile.java
jdk/test/tools/launcher/profiles/Basic.java
jdk/test/tools/launcher/profiles/Logging.java
jdk/test/tools/launcher/profiles/Main.java
jdk/test/tools/launcher/profiles/VersionCheck.java
--- a/jdk/.hgtags	Tue Aug 20 17:44:18 2013 -0700
+++ b/jdk/.hgtags	Fri Aug 23 14:14:05 2013 -0700
@@ -225,3 +225,4 @@
 6901612328239fbd471d20823113c1cf3fdaebee jdk8-b101
 8ed8e2b4b90e0ac9aa5b3efef51cd576a9db96a9 jdk8-b102
 e0f6039c0290b7381042a6fec3100a69a5a67e37 jdk8-b103
+f1d8d15bfcb5ada858a942f8a31f6598f23214d1 jdk8-b104