Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Thu, 12 Jun 2014 15:37:29 -0700
changeset 24905 bd3cf6f243be
parent 24822 c5495e25c725 (diff)
parent 24904 668968682128 (current diff)
child 24906 26e23230009a
child 25004 b33effe4f252
Merge
langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java file | annotate | diff | comparison | revisions 
--- a/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -259,3 +259,4 @@
 97932f6ad950ae5a73a9da5c96e6e58503ff646b jdk9-b14
 74eb0778e4f2dbff6628e718378449fba27c4265 jdk9-b15
 4a09f5d30be844ac6f714bdb0f63d8c3c08b9a98 jdk9-b16
+410bccbded9e9cce80f1e13ad221e37ae97a3986 jdk9-b17
--- a/.hgtags-top-repo	Thu Jun 12 11:32:23 2014 -0400
+++ b/.hgtags-top-repo	Thu Jun 12 15:37:29 2014 -0700
@@ -259,3 +259,4 @@
 4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14
 b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15
 cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
+24152ee0ee1abef54a8bab04c099261dba7bcca5 jdk9-b17
--- a/corba/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/corba/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -259,3 +259,4 @@
 a2b82f863ba95a596da555a4c1b871c404863e7e jdk9-b14
 e54022d0dd92106fff7f7fe670010cd7e6517ee3 jdk9-b15
 422ef9d29d84f571453f015c4cb8713c3af70ee4 jdk9-b16
+4c75c2ca7cf3e0618315879acf17f42c8fcd0c09 jdk9-b17
--- a/hotspot/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/hotspot/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -419,3 +419,4 @@
 bd333491bb6c012d7b606939406d0fa9a5ac7ffd jdk9-b14
 170f6d733d7aec062f743a6b8c1cce940a7a984a jdk9-b15
 b14e7c0b7d3ec04127f565cda1d84122e205680c jdk9-b16
+14b656df31c2cb09c505921061e79977823de71a jdk9-b17
--- a/hotspot/make/jprt.properties	Thu Jun 12 11:32:23 2014 -0400
+++ b/hotspot/make/jprt.properties	Thu Jun 12 15:37:29 2014 -0700
@@ -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
--- a/jaxp/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/jaxp/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -259,3 +259,4 @@
 32b3fc4bc7374a34d52b7f4e2391b4b4b0c084e8 jdk9-b14
 6bad71866c7598587860e0981b0b0e51ec8c0476 jdk9-b15
 a1461221b05d4620e4d7d1907e2a0282aaedf31c jdk9-b16
+6f923fcbe5129eceb9617a9a18dbdd743980e785 jdk9-b17
--- a/jaxws/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/jaxws/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -262,3 +262,4 @@
 02e58850b7062825308413d420f2b02c1f25a724 jdk9-b14
 e9780330017a6b464a385356d77e5136f9de8d09 jdk9-b15
 1e1a3b2215b7551d88e89d1ca8c1e1ebe3d3c0ab jdk9-b16
+6b159e727dac283f424b7d19f5be3ddd9f85acf5 jdk9-b17
--- a/jdk/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/jdk/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -259,3 +259,4 @@
 5c7a17a81afd0906b53ee31d95a3211c96ff6b25 jdk9-b14
 4537360f09fe23ab339ee588747b657feb12d0c8 jdk9-b15
 ab7d2c565b0de5bee1361d282d4029371327fc9e jdk9-b16
+fd8e675f141b9bdb2f46d1ae8251f4ee3a895d64 jdk9-b17
--- a/langtools/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/langtools/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -259,3 +259,4 @@
 1df3f53b9d980b66739f05e14053381ffb0f38ee jdk9-b14
 8666a9611eb8ba711b001bf8d942282e3e2d8e3d jdk9-b15
 7d67ebd3e35c3c36ad2caee482a84f8310d2f838 jdk9-b16
+b64f8d5b97faa29e4d629bf4e56ebe0e26c40ecc jdk9-b17
--- a/make/jprt.properties	Thu Jun 12 11:32:23 2014 -0400
+++ b/make/jprt.properties	Thu Jun 12 15:37:29 2014 -0700
@@ -25,7 +25,7 @@
 
 # Properties for jprt
 
-# Locked down to jdk8
+# Locked down to jdk9
 jprt.tools.default.release=jdk9
 
 # Unix toolkit to use for building on windows
@@ -36,8 +36,8 @@
 
 # Standard list of jprt build targets for this source tree
 jprt.build.targets= 						\
-    solaris_sparcv9_5.10-{product|fastdebug}, 			\
-    solaris_x64_5.10-{product|fastdebug}, 			\
+    solaris_sparcv9_5.11-{product|fastdebug}, 			\
+    solaris_x64_5.11-{product|fastdebug}, 			\
     linux_i586_2.6-{product|fastdebug}, 			\
     linux_x64_2.6-{product|fastdebug}, 				\
     macosx_x64_10.7-{product|fastdebug}, 			\
@@ -49,8 +49,8 @@
 
 # Test target list (no fastdebug & limited c2 testing)
 jprt.my.test.target.set= \
-    solaris_sparcv9_5.10-product-c2-TESTNAME, 			\
-    solaris_x64_5.10-product-c2-TESTNAME, 			\
+    solaris_sparcv9_5.11-product-c2-TESTNAME, 			\
+    solaris_x64_5.11-product-c2-TESTNAME, 			\
     linux_i586_2.6-product-{c1|c2}-TESTNAME, 			\
     linux_x64_2.6-product-c2-TESTNAME, 				\
     macosx_x64_10.7-product-c2-TESTNAME, 			\
@@ -131,8 +131,8 @@
 
 # JCK test targets in test/Makefile (no windows)
 jprt.my.jck.test.target.set=					\
-    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\
-    solaris_x64_5.10-product-c2-JCK7TESTRULE, 			\
+    solaris_sparcv9_5.11-product-c2-JCK7TESTRULE, 		\
+    solaris_x64_5.11-product-c2-JCK7TESTRULE, 			\
     linux_i586_2.6-product-c1-JCK7TESTRULE, 			\
     linux_x64_2.6-product-c2-JCK7TESTRULE
 
--- a/nashorn/.hgtags	Thu Jun 12 11:32:23 2014 -0400
+++ b/nashorn/.hgtags	Thu Jun 12 15:37:29 2014 -0700
@@ -250,3 +250,4 @@
 806df06b6ac58d3e9c9c6a680dbdd7a6c94ca700 jdk9-b14
 32b66f4661eac52f8b04fb3d7703feb2c96febb7 jdk9-b15
 fed8c83dfba4dce94d2ae1cb82f026634ff2a3e4 jdk9-b16
+4a47b7cfecdf2a865811ab08a7ef49c942801d7c jdk9-b17
jdk-sandbox