changeset 1205:4093bbbc9000 jdk7u80-b03

Merge
author asaha
date Tue, 07 Oct 2014 12:35:10 -0700
parents 0126ded60f13 (diff) 03cfa3ea401b (current diff)
children 7faf56bdd783 928d01695cd2
files .hgtags
diffstat 3 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 06 11:16:45 2014 -0700
+++ b/.hgtags	Tue Oct 07 12:35:10 2014 -0700
@@ -516,3 +516,6 @@
 9c6095c8748ba80aa1ffd14f978b24e50abcfdc1 jdk7u72-b13
 fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14
 f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30
+d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00
+90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01
+36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02
--- a/make/jprt.properties	Mon Oct 06 11:16:45 2014 -0700
+++ b/make/jprt.properties	Tue Oct 07 12:35:10 2014 -0700
@@ -83,6 +83,7 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_security1},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security2},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_security3},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_security4},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_rmi},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_management},	\
     ${jprt.my.test.target.set:TESTNAME=jdk_jmx},	\
--- a/test/Makefile	Mon Oct 06 11:16:45 2014 -0700
+++ b/test/Makefile	Tue Oct 07 12:35:10 2014 -0700
@@ -63,7 +63,7 @@
 	jdk_other  \
 	jdk_net  \
 	jdk_nio \
-	jdk_security1 jdk_security2 jdk_security3  \
+	jdk_security1 jdk_security2 jdk_security3 jdk_security4  \
 	jdk_sound  \
 	jdk_text  \
 	jdk_tools \