Merge

Mon, 06 Oct 2014 15:49:12 -0700

author
asaha
date
Mon, 06 Oct 2014 15:49:12 -0700
changeset 1179
5f4937d4217e
parent 1178
ca535e766968
parent 1171
0958d0a9f44e
child 1181
ae2a03818931

Merge

.hgtags file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Sep 24 12:21:38 2014 -0700
     1.2 +++ b/.hgtags	Mon Oct 06 15:49:12 2014 -0700
     1.3 @@ -340,3 +340,4 @@
     1.4  7e286a0c90fb26766b91e3a19467848f39d1f973 jdk8u40-b05
     1.5  8881a63f7f00a4a5611800db7715aecc8f6b3601 jdk8u40-b06
     1.6  cf9afcfcb7a41b892fc896c1dbf245d5dcc42395 jdk8u40-b07
     1.7 +515a912fb5a9a61774fa2afa10f4472589be5602 jdk8u40-b08
     2.1 --- a/make/jprt.properties	Wed Sep 24 12:21:38 2014 -0700
     2.2 +++ b/make/jprt.properties	Mon Oct 06 15:49:12 2014 -0700
     2.3 @@ -167,6 +167,7 @@
     2.4      ${my.test.target.set:TESTNAME=jdk_security1},			\
     2.5      ${my.test.target.set:TESTNAME=jdk_security2},			\
     2.6      ${my.test.target.set:TESTNAME=jdk_security3},			\
     2.7 +    ${my.test.target.set:TESTNAME=jdk_security4},			\
     2.8      ${my.test.target.set:TESTNAME=jdk_rmi},				\
     2.9      ${my.test.target.set:TESTNAME=jdk_text},				\
    2.10      ${my.test.target.set:TESTNAME=jdk_time},				\

mercurial