changeset 1516:76b509f213fe

Merge
author asaha
date Tue, 28 Jul 2015 23:01:03 -0700
parents 40b6f69adf24 (current diff) 31a6e29ec33a (diff)
children 5a6bbf54c3fe
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 23 10:54:38 2015 -0700
+++ b/.hgtags	Tue Jul 28 23:01:03 2015 -0700
@@ -463,3 +463,4 @@
 350f9114b53d85ece93ca95d6a277d0b1503f3f1 jdk8u65-b06
 01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u66-b00
 0ca005b45d10fc8b93852670136a3992038c3722 jdk8u66-b01
+dc132a110960e6b9feff81f0616f7a40a97f3f0f jdk8u66-b02
--- a/make/jprt.properties	Thu Jul 23 10:54:38 2015 -0700
+++ b/make/jprt.properties	Tue Jul 28 23:01:03 2015 -0700
@@ -29,8 +29,8 @@
 #
 
 # The current release name
-my.jdk.update.version=60
-jprt.tools.default.release=jdk8u${my.jdk.update.version}
+my.jdk.update.version=66
+jprt.tools.default.release=jdk8u60
 
 # Check if this is the equivalent of a hotspot push job
 # Interpret -testset hotspot to mean exactly that