# HG changeset patch
# User amurillo
# Date 1426275556 25200
# Node ID ea714a39e902fb8729f71f2d0f634855646e297d
# Parent  6d3ff0d5665732a0cd9cbb83df075a8d37dcedaf# Parent  13af778d07bbefe45dbd79c8dcd02d7014256977
Merge

diff -r 6d3ff0d56657 -r ea714a39e902 make/jprt.properties
--- a/make/jprt.properties	Wed Mar 11 14:10:56 2015 -0700
+++ b/make/jprt.properties	Fri Mar 13 12:39:16 2015 -0700
@@ -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