hg: panama/dev: Manual merge with default
henry.jen at oracle.com
henry.jen at oracle.com
Thu Mar 8 05:31:18 UTC 2018
Changeset: 7a0fb325e58b
Author: henryjen
Date: 2018-03-07 20:00 -0800
URL: http://hg.openjdk.java.net/panama/dev/rev/7a0fb325e58b
Manual merge with default
! make/CompileJavaModules.gmk
! make/autoconf/flags.m4
! make/autoconf/lib-clang.m4
! make/autoconf/libraries.m4
! make/autoconf/spec.gmk.in
! make/common/Modules.gmk
- make/data/x11wrappergen/functions.txt
- make/data/x11wrappergen/sizes.32
- make/data/x11wrappergen/sizes.64
- make/data/x11wrappergen/sizes.64-solaris-i386
- make/hotspot/src/native/dtrace/generateJvmOffsetsMain.c
! make/lib/Lib-jdk.internal.clang.gmk
! make/test/JtregNativeJdk.gmk
- src/java.management/share/classes/sun/management/TypeVersionMapper.java
- src/java.sql/share/classes/javax/transaction/xa/XAException.java
- src/java.sql/share/classes/javax/transaction/xa/XAResource.java
- src/java.sql/share/classes/javax/transaction/xa/Xid.java
- src/java.sql/share/classes/javax/transaction/xa/package.html
! test/jdk/TEST.groups
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so
- test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so
- test/jdk/javax/transaction/testng/Driver.java
- test/jdk/javax/transaction/testng/test/transaction/XAExceptionTests.java
- test/jdk/javax/transaction/testng/util/SerializedTransactionExceptions.java
- test/jdk/sanity/releaseFile/NegativeSOURCETest.java
More information about the panama-dev
mailing list