Mercurial > hg > openjdk > bsd-port

changeset 1310:611f7d38d934 jdk7u80-b30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 31 Mar 2015 11:57:01 -0700
parents 24043edc794f (diff) 127bfeeddc9c (current diff)
children e59b76836386
files .hgtags
diffstat 3 files changed, 17 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Mar 31 11:38:09 2015 -0700
+++ b/.hgtags	Tue Mar 31 11:57:01 2015 -0700
@@ -576,3 +576,18 @@
 434885f8214fd2671ea6b4708663fc9a14505872 jdk7u79-b13
 4dc3a33c7c9d3a88ee566554ffd8253b777aa6a4 jdk7u79-b14
 ee3b3ebecd737ff98883e4f15471887dfdfa8dce jdk7u79-b30
+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
+67dafced5999152f5f88ace0a84122909049182c jdk7u80-b10
+7a31b13266333dbc62825b827fb5730417d7212c jdk7u80-b11
+96d3f807999b5c2d8b07ebf0b79fdbc1952d1109 jdk7u80-b12
+5bd350f497873137786dc6ff5abcae1207bcc30b jdk7u80-b13
+4da82068f37e17858d318d24a5a6284d48627e68 jdk7u80-b14
--- a/make/jprt.properties	Tue Mar 31 11:38:09 2015 -0700
+++ b/make/jprt.properties	Tue Mar 31 11:57:01 2015 -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	Tue Mar 31 11:38:09 2015 -0700
+++ b/test/Makefile	Tue Mar 31 11:57:01 2015 -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 \