changeset 1436:c757d8f32cf6

Merge
author dlong
date Mon, 23 Mar 2015 22:46:24 -0400
parents f2612660b9ad (current diff) 3dbe2c37d11e (diff)
children da6d0717c74a
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Mar 12 17:44:55 2015 -0400
+++ b/.hgtags	Mon Mar 23 22:46:24 2015 -0400
@@ -382,3 +382,5 @@
 590cc3ca1fec083de3543b18b0062651b597e376 jdk8u60-b03
 d8d408861c2094c24e9757a67bf2941ed37ce01f jdk8u60-b04
 e532f3672f635bd83c673c349b7563db6dd470bb jdk8u60-b05
+74dbdbcb6aac9fd62f3599ad4e0a1f930b1e9ac1 jdk8u60-b06
+ea714a39e902fb8729f71f2d0f634855646e297d jdk8u60-b07
--- a/make/jprt.properties	Thu Mar 12 17:44:55 2015 -0400
+++ b/make/jprt.properties	Mon Mar 23 22:46:24 2015 -0400
@@ -29,7 +29,7 @@
 #
 
 # The current release name
-my.jdk.update.version=40
+my.jdk.update.version=60
 jprt.tools.default.release=jdk8u${my.jdk.update.version}
 
 # Check if this is the equivalent of a hotspot push job