changeset 1187:776fec4137e4

Merge
author aph
date Fri, 05 Sep 2014 07:01:11 -0400
parents ac0d7109d4f9 (current diff) 7e286a0c90fb (diff)
children 37b9ea60f8ae
files .hgtags make/jprt.properties
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 04 13:06:04 2014 -0400
+++ b/.hgtags	Fri Sep 05 07:01:11 2014 -0400
@@ -320,6 +320,11 @@
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u20-b21
 6c1fb59fa5d7095d93a023553a949f873f324c6b jdk8u20-b22
 b14daf2459c5430dfe5d435483d6f424cff09584 jdk8u20-b23
+1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24
+1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25
+d1a7ea2c3e1091e0df1285963328a96f475f240d jdk8u20-b26
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 91ba3391548717179e62e08a2d2bd6b8cc774a6d jdk8u40-b02
+a0224ac4135108efdbcf316c7c4b02f8a93c35fe jdk8u40-b03
+e9473185d77a9278e47fc916a255c4905aa74d98 jdk8u40-b04
--- a/make/jprt.properties	Thu Sep 04 13:06:04 2014 -0400
+++ b/make/jprt.properties	Fri Sep 05 07:01:11 2014 -0400
@@ -29,7 +29,7 @@
 #
 
 # The current release name
-my.jdk.update.version=20
+my.jdk.update.version=40
 jprt.tools.default.release=jdk8u${my.jdk.update.version}
 
 # Check if this is the equivalent of a hotspot push job