hg: panama/dev: manual merge with nicl
henry.jen at oracle.com
henry.jen at oracle.com
Thu Jun 28 05:31:29 UTC 2018
Changeset: 7efb1198b124
Author: henryjen
Date: 2018-06-27 22:31 -0700
URL: http://hg.openjdk.java.net/panama/dev/rev/7efb1198b124
manual merge with nicl
! make/autoconf/spec.gmk.in
- src/demo/share/applets.html
- src/demo/share/applets/ArcTest/ArcTest.java
- src/demo/share/applets/ArcTest/example1.html
- src/demo/share/applets/BarChart/BarChart.java
- src/demo/share/applets/BarChart/example1.html
- src/demo/share/applets/BarChart/example2.html
- src/demo/share/applets/Blink/Blink.java
- src/demo/share/applets/Blink/example1.html
- src/demo/share/applets/CardTest/CardTest.java
- src/demo/share/applets/CardTest/example1.html
- src/demo/share/applets/Clock/Clock.java
- src/demo/share/applets/Clock/example1.html
- src/demo/share/applets/DitherTest/DitherTest.java
- src/demo/share/applets/DitherTest/example1.html
- src/demo/share/applets/DrawTest/DrawTest.java
- src/demo/share/applets/DrawTest/example1.html
- src/demo/share/applets/Fractal/CLSFractal.java
- src/demo/share/applets/Fractal/example1.html
- src/demo/share/applets/GraphicsTest/AppletFrame.java
- src/demo/share/applets/GraphicsTest/GraphicsTest.java
- src/demo/share/applets/GraphicsTest/example1.html
- src/demo/share/applets/MoleculeViewer/Matrix3D.java
- src/demo/share/applets/MoleculeViewer/XYZApp.java
- src/demo/share/applets/MoleculeViewer/example1.html
- src/demo/share/applets/MoleculeViewer/example2.html
- src/demo/share/applets/MoleculeViewer/example3.html
- src/demo/share/applets/MoleculeViewer/models/HyaluronicAcid.xyz
- src/demo/share/applets/MoleculeViewer/models/benzene.xyz
- src/demo/share/applets/MoleculeViewer/models/buckminsterfullerine.xyz
- src/demo/share/applets/MoleculeViewer/models/cyclohexane.xyz
- src/demo/share/applets/MoleculeViewer/models/ethane.xyz
- src/demo/share/applets/MoleculeViewer/models/water.xyz
- src/demo/share/applets/NervousText/NervousText.java
- src/demo/share/applets/NervousText/example1.html
- src/demo/share/applets/SimpleGraph/GraphApplet.java
- src/demo/share/applets/SimpleGraph/example1.html
- src/demo/share/applets/SortDemo/BidirBubbleSortAlgorithm.java
- src/demo/share/applets/SortDemo/BubbleSortAlgorithm.java
- src/demo/share/applets/SortDemo/QSortAlgorithm.java
- src/demo/share/applets/SortDemo/SortAlgorithm.java
- src/demo/share/applets/SortDemo/SortItem.java
- src/demo/share/applets/SortDemo/example1.html
- src/demo/share/applets/SpreadSheet/SpreadSheet.java
- src/demo/share/applets/SpreadSheet/example1.html
- src/demo/share/applets/WireFrame/Matrix3D.java
- src/demo/share/applets/WireFrame/ThreeD.java
- src/demo/share/applets/WireFrame/example1.html
- src/demo/share/applets/WireFrame/example2.html
- src/demo/share/applets/WireFrame/example3.html
- src/demo/share/applets/WireFrame/example4.html
- src/demo/share/applets/WireFrame/models/cube.obj
- src/demo/share/applets/WireFrame/models/dinasaur.obj
- src/demo/share/applets/WireFrame/models/hughes_500.obj
- src/demo/share/applets/WireFrame/models/knoxS.obj
- src/demo/share/jfc/SwingApplet/README.txt
- src/demo/share/jfc/SwingApplet/SwingApplet.html
- src/demo/share/jfc/SwingApplet/SwingApplet.java
- src/hotspot/share/gc/cms/cmsOopClosures.cpp
- src/hotspot/share/gc/cms/cms_specialized_oop_closures.hpp
- src/hotspot/share/gc/cms/parOopClosures.cpp
- src/hotspot/share/gc/g1/g1_specialized_oop_closures.hpp
- src/hotspot/share/gc/serial/serial_specialized_oop_closures.hpp
- src/hotspot/share/gc/shared/genOopClosures.cpp
- src/hotspot/share/gc/shared/specialized_oop_closures.hpp
- src/hotspot/share/gc/z/z_specialized_oop_closures.hpp
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
! src/java.base/share/classes/module-info.java
- src/java.base/share/classes/sun/net/RegisteredDomain.java
- src/java.base/share/classes/sun/security/ssl/ALPNExtension.java
- src/java.base/share/classes/sun/security/ssl/Alerts.java
- src/java.base/share/classes/sun/security/ssl/AppInputStream.java
- src/java.base/share/classes/sun/security/ssl/AppOutputStream.java
- src/java.base/share/classes/sun/security/ssl/ByteBufferInputStream.java
- src/java.base/share/classes/sun/security/ssl/CertStatusReqExtension.java
- src/java.base/share/classes/sun/security/ssl/CertStatusReqItemV2.java
- src/java.base/share/classes/sun/security/ssl/CertStatusReqListV2Extension.java
- src/java.base/share/classes/sun/security/ssl/CipherBox.java
- src/java.base/share/classes/sun/security/ssl/CipherSuiteList.java
- src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java
- src/java.base/share/classes/sun/security/ssl/ClientKeyExchangeService.java
- src/java.base/share/classes/sun/security/ssl/DHCrypt.java
- src/java.base/share/classes/sun/security/ssl/Debug.java
- src/java.base/share/classes/sun/security/ssl/ECDHCrypt.java
- src/java.base/share/classes/sun/security/ssl/EllipticPointFormatsExtension.java
- src/java.base/share/classes/sun/security/ssl/ExtensionType.java
- src/java.base/share/classes/sun/security/ssl/HandshakeInStream.java
- src/java.base/share/classes/sun/security/ssl/HandshakeMessage.java
- src/java.base/share/classes/sun/security/ssl/HandshakeStateManager.java
- src/java.base/share/classes/sun/security/ssl/Handshaker.java
- src/java.base/share/classes/sun/security/ssl/HelloExtension.java
- src/java.base/share/classes/sun/security/ssl/HelloExtensions.java
- src/java.base/share/classes/sun/security/ssl/MAC.java
- src/java.base/share/classes/sun/security/ssl/MaxFragmentLengthExtension.java
- src/java.base/share/classes/sun/security/ssl/NamedGroup.java
- src/java.base/share/classes/sun/security/ssl/NamedGroupType.java
- src/java.base/share/classes/sun/security/ssl/OCSPStatusRequest.java
- src/java.base/share/classes/sun/security/ssl/ProtocolList.java
- src/java.base/share/classes/sun/security/ssl/RenegotiationInfoExtension.java
- src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java
- src/java.base/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
- src/java.base/share/classes/sun/security/ssl/StatusRequest.java
- src/java.base/share/classes/sun/security/ssl/StatusRequestType.java
- src/java.base/share/classes/sun/security/ssl/UnknownExtension.java
- src/java.base/share/classes/sun/security/ssl/UnknownStatusRequest.java
! src/java.base/windows/native/libjava/jni_util_md.c
- src/java.desktop/share/classes/sun/awt/DesktopBrowse.java
- src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/KerberosPreMasterSecret.java
- src/java.security.jgss/share/classes/sun/security/krb5/internal/ssl/Krb5KeyExchangeService.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntimeProvider.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotMethodUnresolved.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedField.java
- src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotUnresolvedJavaType.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/GraphSpeculationLog.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_base.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_controls.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_fxml.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_graphics.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_media.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_swing.java
- test/hotspot/jtreg/applications/ctw/modules/javafx_web.java
- test/jdk/java/awt/grab/MenuDragEvents/MenuDragEvents.html
- test/jdk/javax/swing/JSpinner/6421058/bug6421058.java
- test/jdk/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java
- test/jdk/sun/security/krb5/auto/SSL.java
- test/jdk/sun/security/krb5/auto/SSLwithPerms.java
- test/jdk/sun/security/krb5/auto/UnboundSSL.java
- test/jdk/sun/security/krb5/auto/UnboundSSLMultipleKeys.java
- test/jdk/sun/security/krb5/auto/UnboundSSLPrincipalProperty.java
- test/jdk/sun/security/krb5/auto/UnboundSSLUtils.java
- test/jdk/sun/security/krb5/auto/unbound.ssl.jaas.conf
- test/jdk/sun/security/krb5/auto/unbound.ssl.policy
- test/jdk/sun/security/ssl/ExtensionType/OptimalListSize.java
- test/jdk/sun/security/ssl/SSLEngineImpl/CloseInboundException.java
- test/jdk/sun/security/ssl/StatusStapling/RunStatReqSelect.java
- test/jdk/sun/security/ssl/StatusStapling/TEST.properties
- test/jdk/sun/security/ssl/StatusStapling/TestRun.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/BogusStatusRequest.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqExtensionTests.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqItemV2Tests.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/CertStatusReqListV2ExtensionTests.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/OCSPStatusRequestTests.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusReqSelection.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/StatusResponseManagerTests.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestCase.java
- test/jdk/sun/security/ssl/StatusStapling/java.base/sun/security/ssl/TestUtils.java
More information about the panama-dev
mailing list