Merge

Tue, 28 Jul 2015 23:36:47 -0700

author
asaha
date
Tue, 28 Jul 2015 23:36:47 -0700
changeset 1592
bb4179f43ef3
parent 1591
d975954a8bc7
parent 1534
5a6bbf54c3fe
child 1593
3782875a09d4

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Jul 23 11:08:56 2015 -0700
     1.2 +++ b/.hgtags	Tue Jul 28 23:36:47 2015 -0700
     1.3 @@ -461,6 +461,8 @@
     1.4  62625c423592073a935388bf46a78a3747c6fbe3 jdk8u65-b04
     1.5  5476dd40852d9d38afa4850edb78a951e91c14dd jdk8u65-b05
     1.6  350f9114b53d85ece93ca95d6a277d0b1503f3f1 jdk8u65-b06
     1.7 +2b2d10e6b9bf2702b934140fb8ff2e1509b20daf jdk8u65-b07
     1.8  01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u66-b00
     1.9  0ca005b45d10fc8b93852670136a3992038c3722 jdk8u66-b01
    1.10 +dc132a110960e6b9feff81f0616f7a40a97f3f0f jdk8u66-b02
    1.11  ab2d570584a2bb01a6fedf7bd483443fdfc3d799 jdk8u71-b00
     2.1 --- a/make/jprt.properties	Thu Jul 23 11:08:56 2015 -0700
     2.2 +++ b/make/jprt.properties	Tue Jul 28 23:36:47 2015 -0700
     2.3 @@ -29,8 +29,8 @@
     2.4  #
     2.5  
     2.6  # The current release name
     2.7 -my.jdk.update.version=60
     2.8 -jprt.tools.default.release=jdk8u${my.jdk.update.version}
     2.9 +my.jdk.update.version=66
    2.10 +jprt.tools.default.release=jdk8u60
    2.11  
    2.12  # Check if this is the equivalent of a hotspot push job
    2.13  # Interpret -testset hotspot to mean exactly that

mercurial