# HG changeset patch
# User andrew
# Date 1413483489 -3600
# Node ID 7faf56bdd78300c06ef2dae652877d17c9be0037
# Parent  2e6262e0182a13dfc4888486d3fcd6c338fd9815# Parent  4093bbbc90009bfd9311ccd6373c7a2f2755c9d9
Merge 2014/10/14

diff -r 2e6262e0182a -r 7faf56bdd783 .hgtags
--- a/.hgtags	Sat Sep 13 16:38:56 2014 +0100
+++ b/.hgtags	Thu Oct 16 19:18:09 2014 +0100
@@ -435,6 +435,9 @@
 1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
 5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32
 fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33
+6041c68893932ee16a272a8d5a42069e217d888c jdk7u55-b34
+8733fb47b3338e9285870b09eb326e758cf69771 jdk7u55-b35
+b9c954604ecaaf8d8a1568ababd9508ff09b742e jdk7u55-b36
 11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
 88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01
 6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
@@ -463,6 +466,10 @@
 472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18
 b9264ea7e0887d511318bf7b53d12f944760bbbb jdk7u65-b01
 2a7a5e774023944f291ee27ca5b3ad89e0e62aaf jdk7u60-b19
+ac5183999ba532c6b89f24fe01f6f0eb96799719 jdk7u60-b30
+7e9c1a4c2d50e10ccc6d81b8dc0786e82128a676 jdk7u60-b31
+f792c1446b57932f5cd661afa72bcf41cfe6d1a6 jdk7u60-b32
+870408bbbfa50a6f44997a844c6c31c0cb0cbc40 jdk7u60-b33
 3a683f1730a148bcc1ca6eb9137116db427093f6 jdk7u65-b02
 c154a8de7d34128ab75f46a2b6a909796f63b6e3 jdk7u65-b03
 62e22dbc36410d76716bfa5e9fd679fcb4b1d845 jdk7u65-b04
@@ -483,8 +490,55 @@
 fa242615607fa5f6cdd1ae93bc2fb9cc2100c179 jdk7u65-b18
 64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b19
 90f56be6f9d90f66e558c4e08084e2b169738fba jdk7u65-b32
+b6da128e8a7957f139933a48580e201e938c4684 jdk7u65-b20
+d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01
+64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b40
+9dfdf107c6971cd30c7e1f656cddc6b8d495c290 jdk7u65-b31
+fe700de0735dc4e8ce5a50971ad3ea3dc052d21d jdk7u65-b33
+48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u66-b00
+4fb9423d086d86d212257afd6fc79957f737af5b jdk7u66-b01
+964663d4303723fbcb16cf05e857576c08c237ae jdk7u66-b09
+6bf8128234ad7ffae0cfe53ba19202559743de97 jdk7u66-b10
+0d8c4e40851835989386c1b1db4041b6f18b037e jdk7u66-b11
+422f828e10beb3ca9e14b10774e624ec0c4fc84d jdk7u66-b12
+236545aa997a99b397e73dc9b13353231f20ea1e jdk7u66-b13
+d06bbfe19d6cefe62e359c2fd8bf9243a148a337 jdk7u66-b14
+df30693e9a66897ba0dced205bbaefc57dca7704 jdk7u66-b15
+6dc5eb9b70071b43cb0e287f30afd0348ae20ae1 jdk7u66-b16
+4f4905b6d3e837c50654bc432956a4a100246d4e jdk7u66-b17
+c779fbb7b87ec014a3371b0dd1e9317ba1280469 jdk7u71-b00
+4f0a225f8d383d22a890575b1206f916277c0a07 jdk7u71-b01
+94e1109f4cb79ba1c5369d93d0cdf300f1434a3a jdk7u71-b02
+91df9e49ab7d35ee61f88eedd4289aa33163287d jdk7u71-b03
+47c30fe92b9dad64f99d7aa72a2258bc3558f0a1 jdk7u71-b04
+d534e7f2caadd145b30dfda8b913c9a5fdb62553 jdk7u71-b05
+8821211202a58c0086e7cd57960a3f33e5c3d4a1 jdk7u71-b06
+6955561791886ef36236799794e4be79d0a65007 jdk7u71-b07
+fac69efbf4eb609e860c8c4a056dbe02b3679b87 jdk7u71-b08
+ac4596f9cdeb084af75884825e04dbcf1fd3d407 jdk7u71-b09
+38f4eee9c9387d3f683b86657fd6e3d4a90e5b0f jdk7u71-b10
+e9663e434024cb6e011013e774445a056417bb3b jdk7u71-b11
+78aa78b55b843697a630ed886962ab07d1b76358 jdk7u71-b12
+9fc5aeb0e0a8c97b1cd263a55f3aeb030cbcdf89 jdk7u71-b13
+ade1a91dba7391ef319a2fc646138387e6416436 jdk7u71-b14
+423ddccf39073af15eb78623f89f1080612b5b3d jdk7u72-b01
+5f985e54beec37de3ad2261d82665d378143a8dc jdk7u72-b02
+e6e679e8dc418d9174668f445af10e2a6d71ce39 jdk7u72-b03
+32b4ccb2a7ada38639a4869a5628bda061d8563e jdk7u72-b04
+15e7f04f32510469be2ab44b4547cb8acb19d04a jdk7u72-b05
+9c732ba56ec06696e218f7b70ddc432295638d79 jdk7u72-b06
+a7679adac6cc7ff6a2893e4df447c39937f59eda jdk7u72-b07
+44a9b66255b9b8a200c0e53338145bac86381576 jdk7u72-b08
+66c1df24154b1c8c67fd9bed0b6d366452a46fb0 jdk7u72-b09
+a8993ba5a86938e6bd9ab7c41401610b0e36afce jdk7u72-b10
+8d695cc7268f902f235506ac8d3849a4dd118bee jdk7u72-b11
+965b19722fce7a8303b89fc9288f7b6a9cf70922 jdk7u72-b12
+9c6095c8748ba80aa1ffd14f978b24e50abcfdc1 jdk7u72-b13
+fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14
+f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30
 d4397128f8b65eb96287128575dd1a3da6a7825b jdk7u80-b00
 90564f0970e92b844122be27f051655aef6dc423 jdk7u80-b01
 390d699dae6114bbe08e4a9bb8da6fec390fb5d8 icedtea-2.6pre07
 b07e2aed0a26019953ce2ac6b88e73091374a541 icedtea-2.6pre06
 df23e37605061532939ee85bba23c8368425deee icedtea-2.6pre08
+36e8397bf04d972519b80ca9e24e68a2ed1e4dbd jdk7u80-b02
diff -r 2e6262e0182a -r 7faf56bdd783 make/jprt.properties
--- a/make/jprt.properties	Sat Sep 13 16:38:56 2014 +0100
+++ b/make/jprt.properties	Thu Oct 16 19:18:09 2014 +0100
@@ -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},	\
diff -r 2e6262e0182a -r 7faf56bdd783 test/Makefile
--- a/test/Makefile	Sat Sep 13 16:38:56 2014 +0100
+++ b/test/Makefile	Thu Oct 16 19:18:09 2014 +0100
@@ -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 \