Merge

Tue, 16 Sep 2014 14:15:26 -0700

author
lana
date
Tue, 16 Sep 2014 14:15:26 -0700
changeset 1168
b98648e6011f
parent 1164
8881a63f7f00
parent 1167
39a27de39e83
child 1169
f76be00858f5

Merge

     1.1 --- a/make/jprt.properties	Wed Sep 10 09:05:28 2014 -0700
     1.2 +++ b/make/jprt.properties	Tue Sep 16 14:15:26 2014 -0700
     1.3 @@ -167,6 +167,7 @@
     1.4      ${my.test.target.set:TESTNAME=jdk_security1},			\
     1.5      ${my.test.target.set:TESTNAME=jdk_security2},			\
     1.6      ${my.test.target.set:TESTNAME=jdk_security3},			\
     1.7 +    ${my.test.target.set:TESTNAME=jdk_security4},			\
     1.8      ${my.test.target.set:TESTNAME=jdk_rmi},				\
     1.9      ${my.test.target.set:TESTNAME=jdk_text},				\
    1.10      ${my.test.target.set:TESTNAME=jdk_time},				\

mercurial