Merge

Tue, 17 Mar 2015 11:18:02 -0700

author
amurillo
date
Tue, 17 Mar 2015 11:18:02 -0700
changeset 1326
5a5becfbb9a0
parent 1325
9c1b87028450
parent 1318
ea714a39e902
child 1327
98c39032b4a1

Merge

     1.1 --- a/make/jprt.properties	Thu Mar 12 13:44:39 2015 -0700
     1.2 +++ b/make/jprt.properties	Tue Mar 17 11:18:02 2015 -0700
     1.3 @@ -29,7 +29,7 @@
     1.4  #
     1.5  
     1.6  # The current release name
     1.7 -my.jdk.update.version=40
     1.8 +my.jdk.update.version=60
     1.9  jprt.tools.default.release=jdk8u${my.jdk.update.version}
    1.10  
    1.11  # Check if this is the equivalent of a hotspot push job

mercurial