Merge
authorduke
Wed, 05 Jul 2017 19:44:20 +0200
changeset 24809 08f4899ce9e8
parent 24808 f41278d32da8 (diff)
parent 24805 09ca10d317fc (current diff)
child 24811 ab172543e4c4
Merge
--- a/hotspot/.hgtags	Thu Jun 12 18:42:29 2014 +0000
+++ b/hotspot/.hgtags	Wed Jul 05 19:44:20 2017 +0200
@@ -419,3 +419,4 @@
 bd333491bb6c012d7b606939406d0fa9a5ac7ffd jdk9-b14
 170f6d733d7aec062f743a6b8c1cce940a7a984a jdk9-b15
 b14e7c0b7d3ec04127f565cda1d84122e205680c jdk9-b16
+14b656df31c2cb09c505921061e79977823de71a jdk9-b17
--- a/hotspot/make/jprt.properties	Thu Jun 12 18:42:29 2014 +0000
+++ b/hotspot/make/jprt.properties	Wed Jul 05 19:44:20 2017 +0200
@@ -47,10 +47,10 @@
 #       sparc etc.
 
 # Define the Solaris platforms we want for the various releases
-jprt.my.solaris.sparcv9.jdk9=solaris_sparcv9_5.10
+jprt.my.solaris.sparcv9.jdk9=solaris_sparcv9_5.11
 jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
 
-jprt.my.solaris.x64.jdk9=solaris_x64_5.10
+jprt.my.solaris.x64.jdk9=solaris_x64_5.11
 jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
 
 jprt.my.linux.i586.jdk9=linux_i586_2.6