hg: panama/dev: Automatic merge with default

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Wed Dec 19 21:04:07 UTC 2018


Changeset: 237793b778f1
Author:    mcimadamore
Date:      2018-12-19 22:09 +0100
URL:       http://hg.openjdk.java.net/panama/dev/rev/237793b778f1

Automatic merge with default

- src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.cpp
- src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.hpp
- src/java.base/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java
- src/java.logging/share/classes/java/util/logging/package.html
- src/java.prefs/share/classes/java/util/prefs/package.html
- src/java.rmi/share/classes/java/rmi/activation/package.html
- src/java.rmi/share/classes/java/rmi/dgc/package.html
- src/java.rmi/share/classes/java/rmi/package.html
- src/java.rmi/share/classes/java/rmi/registry/package.html
- src/java.rmi/share/classes/java/rmi/server/package.html
- src/java.rmi/share/classes/javax/rmi/ssl/package.html
- src/java.security.jgss/share/classes/org/ietf/jgss/package.html
- src/java.smartcardio/share/classes/javax/smartcardio/package.html
- src/java.sql.rowset/share/classes/com/sun/rowset/package.html
- src/java.sql.rowset/share/classes/com/sun/rowset/providers/package.html
- src/java.sql.rowset/share/classes/javax/sql/rowset/serial/package.html
- src/java.sql/share/classes/java/sql/package.html
- src/java.sql/share/classes/javax/sql/package.html
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/Key.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/KeyStore.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSACipher.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPair.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPrivateKey.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSAPublicKey.java
- src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi/RSASignature.java
- test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorEventsForTwoThreadsTest.java
- test/jdk/java/net/MulticastSocket/PromiscuousIPv6.java
- test/jdk/java/nio/channels/DatagramChannel/PromiscuousIPv6.java



More information about the panama-dev mailing list