Mercurial > hg > openjdk > bsd-port

changeset 1293:67dafced5999 jdk7u80-b10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 16 Feb 2015 10:48:46 -0800
parents 44af607ed6ec (diff) be4cf73f2c91 (current diff)
children 95aad4e26f3c
files .hgtags
diffstat 3 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Feb 16 10:42:22 2015 -0800
+++ b/.hgtags	Mon Feb 16 10:48:46 2015 -0800
@@ -571,3 +571,13 @@
 52a09e691b39ab0f23ca0830fbb2a372e157990c jdk7u79-b08
 5127e5f6909283ade8de12d0a912b82383cd0084 jdk7u79-b09
 83f6693e12e6265e914ad07b5fe137ab01c2dbbf jdk7u79-b10
+d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00
+90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01
+36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02
+4093bbbc90009bfd9311ccd6373c7a2f2755c9d9 jdk7u80-b03
+928d01695cd2b65119bbfcd51032ae427a66f83d jdk7u80-b04
+46d516760a680deaeffdb03e3221648bc14c0818 jdk7u80-b05
+8fffdc2d1faaf2c61abff00ee41f50d28da2174a jdk7u80-b06
+6d0aaea852b04d7270fde5c289827b00f2391374 jdk7u80-b07
+e8daab5fb25eb513c53d6d766d50caf662131d79 jdk7u80-b08
+8c0f70ebdfbd5b06c759ab762b093e8c3ee6558e jdk7u80-b09
--- a/make/jprt.properties	Mon Feb 16 10:42:22 2015 -0800
+++ b/make/jprt.properties	Mon Feb 16 10:48:46 2015 -0800
@@ -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 Feb 16 10:42:22 2015 -0800
+++ b/test/Makefile	Mon Feb 16 10:48:46 2015 -0800
@@ -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 \