# HG changeset patch
# User asaha
# Date 1412635752 25200
# Node ID 5f4937d4217e8e68708062f14519fe2169cc7ef8
# Parent  ca535e76696851550a2aa6617db9da9e6576cc5b# Parent  0958d0a9f44efcebe30b17b07240abaa42a2112b
Merge

diff -r ca535e766968 -r 5f4937d4217e .hgtags
--- a/.hgtags	Wed Sep 24 12:21:38 2014 -0700
+++ b/.hgtags	Mon Oct 06 15:49:12 2014 -0700
@@ -340,3 +340,4 @@
 7e286a0c90fb26766b91e3a19467848f39d1f973 jdk8u40-b05
 8881a63f7f00a4a5611800db7715aecc8f6b3601 jdk8u40-b06
 cf9afcfcb7a41b892fc896c1dbf245d5dcc42395 jdk8u40-b07
+515a912fb5a9a61774fa2afa10f4472589be5602 jdk8u40-b08
diff -r ca535e766968 -r 5f4937d4217e make/jprt.properties
--- a/make/jprt.properties	Wed Sep 24 12:21:38 2014 -0700
+++ b/make/jprt.properties	Mon Oct 06 15:49:12 2014 -0700
@@ -167,6 +167,7 @@
     ${my.test.target.set:TESTNAME=jdk_security1},			\
     ${my.test.target.set:TESTNAME=jdk_security2},			\
     ${my.test.target.set:TESTNAME=jdk_security3},			\
+    ${my.test.target.set:TESTNAME=jdk_security4},			\
     ${my.test.target.set:TESTNAME=jdk_rmi},				\
     ${my.test.target.set:TESTNAME=jdk_text},				\
     ${my.test.target.set:TESTNAME=jdk_time},				\