Merge
authorduke
Wed, 05 Jul 2017 17:26:50 +0200
changeset 7069 1ca4763ea9f0
parent 7068 bc960be59c11 (diff)
parent 7067 61420b050b4c (current diff)
child 7084 ea14efe08312
Merge
hotspot/src/os/linux/vm/objectMonitor_linux.cpp
hotspot/src/os/linux/vm/objectMonitor_linux.hpp
hotspot/src/os/linux/vm/objectMonitor_linux.inline.hpp
hotspot/src/os/solaris/vm/objectMonitor_solaris.cpp
hotspot/src/os/solaris/vm/objectMonitor_solaris.hpp
hotspot/src/os/solaris/vm/objectMonitor_solaris.inline.hpp
hotspot/src/os/windows/vm/objectMonitor_windows.cpp
hotspot/src/os/windows/vm/objectMonitor_windows.hpp
hotspot/src/os/windows/vm/objectMonitor_windows.inline.hpp
jdk/src/share/classes/java/dyn/JavaMethodHandle.java
jdk/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
jdk/src/share/classes/sun/java2d/pisces/LineSink.java
jdk/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
jdk/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
--- a/jaxws/.hgtags	Wed Jul 05 17:26:46 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:26:50 2017 +0200
@@ -91,3 +91,4 @@
 400f494c81c5ec87714b705648afbb3cb680bf73 jdk7-b114
 824cc44bd6eba9abae07cc420f7fe3926c1adbd9 jdk7-b115
 376ac153078dd3b5f6d4a0981feee092c1492c96 jdk7-b116
+1320fb3bb588298c79716bd2d10b5b4afacb9370 jdk7-b117