hg: jdk/sandbox: Merge
alan.bateman at oracle.com
alan.bateman at oracle.com
Fri May 17 13:49:37 UTC 2019
Changeset: f0a1d9760c5e
Author: alanb
Date: 2019-05-17 13:21 +0100
URL: http://hg.openjdk.java.net/jdk/sandbox/rev/f0a1d9760c5e
Merge
- make/data/cldr/common/main/ff_CM.xml
- make/data/cldr/common/main/ff_GN.xml
- make/data/cldr/common/main/ff_MR.xml
- make/data/cldr/common/main/ff_SN.xml
- make/data/cldr/common/main/yue_HK.xml
- make/data/cldr/common/supplemental/telephoneCodeData.xml
- src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetC1_aarch64.cpp
- src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetC1_x86.cpp
- src/hotspot/share/gc/g1/g1InCSetState.hpp
- src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
- src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
- src/hotspot/share/gc/z/zPreMappedMemory.cpp
- src/hotspot/share/gc/z/zPreMappedMemory.hpp
- src/hotspot/share/gc/z/zPreMappedMemory.inline.hpp
! src/java.base/share/classes/java/net/ServerSocket.java
! src/java.base/share/classes/sun/nio/ch/ServerSocketChannelImpl.java
! src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
! src/java.base/windows/classes/sun/nio/ch/SocketDispatcher.java
! src/java.base/windows/native/libnio/ch/SocketDispatcher.c
- src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpic.h
- src/java.desktop/share/native/libfreetype/src/autofit/afpic.c
- src/java.desktop/share/native/libfreetype/src/autofit/afpic.h
- src/java.desktop/share/native/libfreetype/src/base/basepic.c
- src/java.desktop/share/native/libfreetype/src/base/basepic.h
- src/java.desktop/share/native/libfreetype/src/base/ftapi.c
- src/java.desktop/share/native/libfreetype/src/base/ftpic.c
- src/java.desktop/share/native/libfreetype/src/base/md5.c
- src/java.desktop/share/native/libfreetype/src/base/md5.h
- src/java.desktop/share/native/libfreetype/src/cff/cffpic.c
- src/java.desktop/share/native/libfreetype/src/cff/cffpic.h
- src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.c
- src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.h
- src/java.desktop/share/native/libfreetype/src/psnames/pspic.c
- src/java.desktop/share/native/libfreetype/src/psnames/pspic.h
- src/java.desktop/share/native/libfreetype/src/raster/rastpic.c
- src/java.desktop/share/native/libfreetype/src/raster/rastpic.h
- src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.c
- src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.h
- src/java.desktop/share/native/libfreetype/src/smooth/ftspic.c
- src/java.desktop/share/native/libfreetype/src/smooth/ftspic.h
- src/java.desktop/share/native/libfreetype/src/truetype/ttpic.c
- src/java.desktop/share/native/libfreetype/src/truetype/ttpic.h
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZPhysicalMemoryManager.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-3.3.1.js
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/script-dir/jquery-migrate-3.0.1.js
- src/jdk.javadoc/share/legal/jquery-migrate.md
- test/fmw/gtest/README
! test/jdk/ProblemList.txt
- test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java
! test/jdk/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java
! test/jdk/java/net/ServerSocket/UnreferencedSockets.java
! test/jdk/java/net/Socket/asyncClose/AsyncClose.java
! test/jdk/java/net/Socket/asyncClose/BrokenPipe.java
! test/jdk/java/net/SocketOption/OptionsTest.java
! test/jdk/java/net/ipv6tests/TcpTest.java
! test/micro/org/openjdk/bench/java/net/SocketReadWrite.java
More information about the jdk-sandbox-changes
mailing list