Merge
authorduke
Wed, 05 Jul 2017 17:33:39 +0200
changeset 8029 ef179c44068f
parent 8028 86a3def1e503 (diff)
parent 8027 0b485cb2e06c (current diff)
child 8051 85a8fae9d6e0
Merge
hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
hotspot/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
jdk/make/java/hpi/Makefile
jdk/make/java/hpi/hpi_common.gmk
jdk/make/java/hpi/native/Makefile
jdk/make/java/hpi/native/mapfile-vers
jdk/make/java/hpi/native/reorder-i586
jdk/make/java/hpi/native/reorder-sparc
jdk/make/java/hpi/native/reorder-sparcv9
jdk/make/java/hpi/windows/Makefile
jdk/src/share/hpi/export/bool.h
jdk/src/share/hpi/export/dll.h
jdk/src/share/hpi/export/hpi.h
jdk/src/share/hpi/include/hpi_impl.h
jdk/src/share/hpi/include/vm_calls.h
jdk/src/share/hpi/src/hpi.c
jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties
jdk/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties
jdk/src/solaris/hpi/export/byteorder_md.h
jdk/src/solaris/hpi/export/hpi_md.h
jdk/src/solaris/hpi/export/io_md.h
jdk/src/solaris/hpi/export/path_md.h
jdk/src/solaris/hpi/export/timeval_md.h
jdk/src/solaris/hpi/include/hpi_init.h
jdk/src/solaris/hpi/include/interrupt.h
jdk/src/solaris/hpi/include/largefile.h
jdk/src/solaris/hpi/include/largefile_linux.h
jdk/src/solaris/hpi/include/largefile_solaris.h
jdk/src/solaris/hpi/native_threads/include/condvar_md.h
jdk/src/solaris/hpi/native_threads/include/monitor_md.h
jdk/src/solaris/hpi/native_threads/include/mutex_md.h
jdk/src/solaris/hpi/native_threads/include/np.h
jdk/src/solaris/hpi/native_threads/include/porting.h
jdk/src/solaris/hpi/native_threads/include/threads_md.h
jdk/src/solaris/hpi/native_threads/src/condvar_md.c
jdk/src/solaris/hpi/native_threads/src/interrupt_md.c
jdk/src/solaris/hpi/native_threads/src/monitor_md.c
jdk/src/solaris/hpi/native_threads/src/mutex_md.c
jdk/src/solaris/hpi/native_threads/src/sys_api_td.c
jdk/src/solaris/hpi/native_threads/src/threads_linux.c
jdk/src/solaris/hpi/native_threads/src/threads_md.c
jdk/src/solaris/hpi/native_threads/src/threads_solaris.c
jdk/src/solaris/hpi/src/interrupt.c
jdk/src/solaris/hpi/src/linker_md.c
jdk/src/solaris/hpi/src/memory_md.c
jdk/src/solaris/hpi/src/system_md.c
jdk/src/windows/hpi/export/byteorder_md.h
jdk/src/windows/hpi/export/hpi_md.h
jdk/src/windows/hpi/export/io_md.h
jdk/src/windows/hpi/export/path_md.h
jdk/src/windows/hpi/export/timeval_md.h
jdk/src/windows/hpi/include/monitor_md.h
jdk/src/windows/hpi/include/mutex_md.h
jdk/src/windows/hpi/include/threads_md.h
jdk/src/windows/hpi/src/linker_md.c
jdk/src/windows/hpi/src/memory_md.c
jdk/src/windows/hpi/src/monitor_md.c
jdk/src/windows/hpi/src/path_md.c
jdk/src/windows/hpi/src/socket_md.c
jdk/src/windows/hpi/src/sys_api_md.c
jdk/src/windows/hpi/src/system_md.c
jdk/src/windows/hpi/src/threads_md.c
jdk/test/java/net/InetAddress/B4762344.java
jdk/test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
jdk/test/java/net/InetAddress/Simple1NameServiceDescriptor.java
jdk/test/java/net/InetAddress/Simple2NameServiceDescriptor.java
jdk/test/java/net/InetAddress/SimpleNameService.java
jdk/test/sun/net/InetAddress/nameservice/B6442088.java
jdk/test/sun/net/InetAddress/nameservice/CacheTest.java
jdk/test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
jdk/test/sun/net/InetAddress/nameservice/SimpleNameService.java
jdk/test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java
--- a/jaxws/.hgtags	Wed Jul 05 17:33:36 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 17:33:39 2017 +0200
@@ -101,3 +101,4 @@
 86f60e5b3975840968f3147ddce047a27a9fc83e jdk7-b124
 d72eea121c3bc2b649272a37b80d9417855b7146 jdk7-b125
 6d772c5119d5e247bc98a57ce8b1be121554ee0a jdk7-b126
+ef19f173578c804772d586a959fa3ab8a12c0598 jdk7-b127