changeset 13443:89f282fd426d

Merge
author mchung
date Thu, 18 May 2017 14:18:07 -0700
parents b3ee8ab233ed 608adb9f402d
children 5b29f6a45bce 408103dc579d
files .hgtags src/share/vm/runtime/vmStructs.cpp src/share/vm/utilities/hashtable.hpp test/gc/metaspace/TestMetaspacePerfCounters.java test/gc/parallel/TestDynShrinkHeap.java test/runtime/BadObjectClass/BootstrapRedefine.java test/runtime/Unsafe/DefineClass.java test/runtime/getSysPackage/GetSysPkgTest.java test/runtime/modules/PatchModule/PatchModule2Dirs.java test/runtime/modules/PatchModule/PatchModuleCDS.java test/runtime/modules/PatchModule/PatchModuleJavaBase.java test/runtime/modules/PatchModule/PatchModuleTest.java test/runtime/modules/PatchModule/PatchModuleTestJar.java test/runtime/modules/PatchModule/PatchModuleTestJarDir.java test/runtime/modules/PatchModule/PatchModuleTraceCL.java test/runtime/modules/Visibility/PatchModuleVisibility.java test/runtime/modules/Visibility/XbootcpNoVisibility.java test/runtime/modules/Visibility/XbootcpVisibility.java
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu May 18 14:54:53 2017 +0000
+++ b/.hgtags	Thu May 18 14:18:07 2017 -0700
@@ -552,6 +552,7 @@
 132a72c782071cc11ab25cc7c9ee167c3632fea4 jdk-9+147
 5e4e893520ecdbd517c6ed6375f0885664fe62c4 jdk-9+148
 30e1996bd55da36183434f24ed964adebf9ca71e jdk-9+149
+8ff4522d2ecb4779a69b8219e19ea10be019da37 jpms-edr
 98fe046473c90204cbc9b34c512b9fc10dfb8479 jdk-9+150
 2a2ac7d9f52c8cb2b80077e515b5840b947e640c jdk-9+151
 31f1d26c60df7b2e516a4f84160d76ba017d4e09 jdk-9+152
@@ -563,10 +564,12 @@
 4e78f30935229f13ce7c43089621cf7169f5abac jdk-9+158
 9211c2e89c1cd11ec2d5752b0f97131a7d7525c7 jdk-9+159
 94b4e2e5331d38eab6a3639c3511b2e0715df0e9 jdk-9+160
+1b26ff0b6e349d04809d9991170a554e8569900f jpms-pr
 191ffbdb3d7b734288daa7fb76b37a0a85dfe7eb jdk-9+161
 b01c519b715ef6f785d0631adee0a6537cf6c12e jdk-9+162
 983fe207555724d98f4876991e1cbafbcf2733e8 jdk-9+163
 0af429be8bbaeaaf0cb838e9af28c953dda6a9c8 jdk-9+164
+3ef5cda929abdca33feb6c30ea365663b747d8c2 jpms-pr2
 c92c6416ca03b1464d5ed99cf6201e52b5ba0a70 jdk-9+165
 560d7aa083a24b6a56443feb8de0f40435d33aa9 jdk-9+166
 1ca7ed1b17b5776930d641d1379834f3140a74e4 jdk-9+167
--- a/.jcheck/conf	Thu May 18 14:54:53 2017 +0000
+++ b/.jcheck/conf	Thu May 18 14:18:07 2017 -0700
@@ -1,1 +1,4 @@
 project=jdk9
+comments=lax
+tags=lax
+bugids=dup