Merge

Mon, 22 Sep 2014 18:33:03 -0700

author
lana
date
Mon, 22 Sep 2014 18:33:03 -0700
changeset 1169
f76be00858f5
parent 1165
cf9afcfcb7a4
parent 1168
b98648e6011f
child 1170
515a912fb5a9

Merge

     1.1 --- a/make/jprt.properties	Wed Sep 17 13:53:20 2014 -0700
     1.2 +++ b/make/jprt.properties	Mon Sep 22 18:33:03 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