hg: panama/dev: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Mar 7 21:13:31 UTC 2018


Changeset: a67b22f42dcf
Author:    mcimadamore
Date:      2018-03-07 22:09 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/a67b22f42dcf

Automatic merge with default

! 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
- 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/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