hg: jdk/sandbox: Merge

ashipile at redhat.com ashipile at redhat.com
Sun May 6 14:20:20 UTC 2018


Changeset: 532bc255382f
Author:    shade
Date:      2018-05-06 16:19 +0200
URL:       http://hg.openjdk.java.net/jdk/sandbox/rev/532bc255382f

Merge

- make/launcher/Launcher-java.desktop.gmk
- src/bsd/doc/man/appletviewer.1
- src/bsd/doc/man/ja/appletviewer.1
! src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
! src/hotspot/cpu/sparc/templateTable_sparc.cpp
! src/hotspot/cpu/x86/c1_Runtime1_x86.cpp
! src/hotspot/cpu/x86/templateTable_x86.cpp
! src/hotspot/share/utilities/macros.hpp
! src/hotspot/share/utilities/vmError.cpp
- src/linux/doc/man/appletviewer.1
- src/linux/doc/man/ja/appletviewer.1
- src/solaris/doc/sun/man/man1/appletviewer.1
- src/solaris/doc/sun/man/man1/ja/appletviewer.1
! test/hotspot/jtreg/TEST.groups
- test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java
- test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
- test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html
- test/jdk/java/lang/invoke/I4Special.jcod
- test/jdk/javax/print/applet/AppletPrintLookup.html
- test/jdk/javax/print/applet/AppletPrintLookup.sh
- test/jdk/javax/print/applet/YesNo.java
- test/jdk/javax/print/applet/applet0/Applet0.java
- test/jdk/javax/print/applet/applet1/Applet1.java
- test/jdk/javax/print/applet/applet1/Applet1PrintService.java
- test/jdk/javax/print/applet/applet1/Applet1PrintServiceLookup.java
- test/jdk/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup
- test/jdk/javax/print/applet/applet2/Applet2.java
- test/jdk/javax/print/applet/applet2/Applet2PrintService.java
- test/jdk/javax/print/applet/applet2/Applet2PrintServiceLookup.java
- test/jdk/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup
- test/jdk/javax/print/applet/applet3/Applet3.java
- test/jdk/javax/print/applet/applet3/Applet3PrintService.java
- test/jdk/javax/print/applet/applet4/Applet4.java
- test/jdk/javax/print/applet/applet4/Applet4PrintService.java
- test/jdk/javax/print/applet/applet4/Applet4PrintServiceLookup.java



More information about the jdk-sandbox-changes mailing list