hg: amber/amber: manual merge with default
vicente.romero at oracle.com
vicente.romero at oracle.com
Wed Nov 28 22:38:40 UTC 2018
Changeset: f22bb3069937
Author: vromero
Date: 2018-11-28 17:38 -0500
URL: http://hg.openjdk.java.net/amber/amber/rev/f22bb3069937
manual merge with default
- src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES
- src/bsd/doc/man/apt.1
- src/bsd/doc/man/ja/apt.1
- src/bsd/doc/man/ja/jar.1
- src/bsd/doc/man/ja/jarsigner.1
- src/bsd/doc/man/ja/java.1
- src/bsd/doc/man/ja/javac.1
- src/bsd/doc/man/ja/javadoc.1
- src/bsd/doc/man/ja/javap.1
- src/bsd/doc/man/ja/javaws.1
- src/bsd/doc/man/ja/jcmd.1
- src/bsd/doc/man/ja/jconsole.1
- src/bsd/doc/man/ja/jdb.1
- src/bsd/doc/man/ja/jdeps.1
- src/bsd/doc/man/ja/jhat.1
- src/bsd/doc/man/ja/jinfo.1
- src/bsd/doc/man/ja/jjs.1
- src/bsd/doc/man/ja/jmap.1
- src/bsd/doc/man/ja/jps.1
- src/bsd/doc/man/ja/jrunscript.1
- src/bsd/doc/man/ja/jsadebugd.1
- src/bsd/doc/man/ja/jstack.1
- src/bsd/doc/man/ja/jstat.1
- src/bsd/doc/man/ja/jstatd.1
- src/bsd/doc/man/ja/keytool.1
- src/bsd/doc/man/ja/pack200.1
- src/bsd/doc/man/ja/rmic.1
- src/bsd/doc/man/ja/rmid.1
- src/bsd/doc/man/ja/rmiregistry.1
- src/bsd/doc/man/ja/serialver.1
- src/bsd/doc/man/ja/unpack200.1
- src/bsd/doc/man/jar.1
- src/bsd/doc/man/jarsigner.1
- src/bsd/doc/man/java.1
- src/bsd/doc/man/javac.1
- src/bsd/doc/man/javadoc.1
- src/bsd/doc/man/javap.1
- src/bsd/doc/man/javaws.1
- src/bsd/doc/man/jcmd.1
- src/bsd/doc/man/jconsole.1
- src/bsd/doc/man/jdb.1
- src/bsd/doc/man/jdeps.1
- src/bsd/doc/man/jhat.1
- src/bsd/doc/man/jinfo.1
- src/bsd/doc/man/jjs.1
- src/bsd/doc/man/jmap.1
- src/bsd/doc/man/jps.1
- src/bsd/doc/man/jrunscript.1
- src/bsd/doc/man/jsadebugd.1
- src/bsd/doc/man/jstack.1
- src/bsd/doc/man/jstat.1
- src/bsd/doc/man/jstatd.1
- src/bsd/doc/man/keytool.1
- src/bsd/doc/man/pack200.1
- src/bsd/doc/man/rmic.1
- src/bsd/doc/man/rmid.1
- src/bsd/doc/man/rmiregistry.1
- src/bsd/doc/man/serialver.1
- src/bsd/doc/man/unpack200.1
- src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java
- src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m
- src/java.desktop/unix/classes/sun/awt/X11/genhash.awk
- src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h
- src/java.desktop/unix/legal/xwindows.md
- src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h
- src/java.desktop/unix/native/libawt_xawt/awt/randr.h
- src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c
- src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core.common/src/org/graalvm/compiler/core/common/spi/ArrayOffsetProvider.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.sparc.test/src/org/graalvm/compiler/core/sparc/test/SPARCAllocatorTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir.amd64/src/org/graalvm/compiler/lir/amd64/AMD64StringIndexOfOp.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/debug/OpaqueNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases.common/src/org/graalvm/compiler/phases/common/util/HashSetNodeEventListener.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.phases/src/org/graalvm/compiler/phases/graph/FixedNodeProbabilityCache.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.amd64/src/org/graalvm/compiler/replacements/amd64/AMD64StringIndexOfNode.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/UnsafeReplacementsTest.java
- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.replacements.jdk9.test/src/org/graalvm/compiler/replacements/jdk9/VarHandleTest.java
- src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES
- src/linux/doc/man/ja/jar.1
- src/linux/doc/man/ja/jarsigner.1
- src/linux/doc/man/ja/java.1
- src/linux/doc/man/ja/javac.1
- src/linux/doc/man/ja/javadoc.1
- src/linux/doc/man/ja/javap.1
- src/linux/doc/man/ja/javaws.1
- src/linux/doc/man/ja/jcmd.1
- src/linux/doc/man/ja/jconsole.1
- src/linux/doc/man/ja/jdb.1
- src/linux/doc/man/ja/jdeps.1
- src/linux/doc/man/ja/jhat.1
- src/linux/doc/man/ja/jinfo.1
- src/linux/doc/man/ja/jjs.1
- src/linux/doc/man/ja/jmap.1
- src/linux/doc/man/ja/jps.1
- src/linux/doc/man/ja/jrunscript.1
- src/linux/doc/man/ja/jsadebugd.1
- src/linux/doc/man/ja/jstack.1
- src/linux/doc/man/ja/jstat.1
- src/linux/doc/man/ja/jstatd.1
- src/linux/doc/man/ja/keytool.1
- src/linux/doc/man/ja/pack200.1
- src/linux/doc/man/ja/rmic.1
- src/linux/doc/man/ja/rmid.1
- src/linux/doc/man/ja/rmiregistry.1
- src/linux/doc/man/ja/serialver.1
- src/linux/doc/man/ja/unpack200.1
- src/linux/doc/man/jar.1
- src/linux/doc/man/jarsigner.1
- src/linux/doc/man/java.1
- src/linux/doc/man/javac.1
- src/linux/doc/man/javadoc.1
- src/linux/doc/man/javap.1
- src/linux/doc/man/javaws.1
- src/linux/doc/man/jcmd.1
- src/linux/doc/man/jconsole.1
- src/linux/doc/man/jdb.1
- src/linux/doc/man/jdeps.1
- src/linux/doc/man/jhat.1
- src/linux/doc/man/jinfo.1
- src/linux/doc/man/jjs.1
- src/linux/doc/man/jmap.1
- src/linux/doc/man/jps.1
- src/linux/doc/man/jrunscript.1
- src/linux/doc/man/jsadebugd.1
- src/linux/doc/man/jstack.1
- src/linux/doc/man/jstat.1
- src/linux/doc/man/jstatd.1
- src/linux/doc/man/keytool.1
- src/linux/doc/man/pack200.1
- src/linux/doc/man/rmic.1
- src/linux/doc/man/rmid.1
- src/linux/doc/man/rmiregistry.1
- src/linux/doc/man/serialver.1
- src/linux/doc/man/unpack200.1
- src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES
- src/solaris/doc/sun/man/man1/ja/jar.1
- src/solaris/doc/sun/man/man1/ja/jarsigner.1
- src/solaris/doc/sun/man/man1/ja/java.1
- src/solaris/doc/sun/man/man1/ja/javac.1
- src/solaris/doc/sun/man/man1/ja/javadoc.1
- src/solaris/doc/sun/man/man1/ja/javap.1
- src/solaris/doc/sun/man/man1/ja/jcmd.1
- src/solaris/doc/sun/man/man1/ja/jconsole.1
- src/solaris/doc/sun/man/man1/ja/jdb.1
- src/solaris/doc/sun/man/man1/ja/jdeps.1
- src/solaris/doc/sun/man/man1/ja/jhat.1
- src/solaris/doc/sun/man/man1/ja/jinfo.1
- src/solaris/doc/sun/man/man1/ja/jjs.1
- src/solaris/doc/sun/man/man1/ja/jmap.1
- src/solaris/doc/sun/man/man1/ja/jps.1
- src/solaris/doc/sun/man/man1/ja/jrunscript.1
- src/solaris/doc/sun/man/man1/ja/jsadebugd.1
- src/solaris/doc/sun/man/man1/ja/jstack.1
- src/solaris/doc/sun/man/man1/ja/jstat.1
- src/solaris/doc/sun/man/man1/ja/jstatd.1
- src/solaris/doc/sun/man/man1/ja/keytool.1
- src/solaris/doc/sun/man/man1/ja/pack200.1
- src/solaris/doc/sun/man/man1/ja/rmic.1
- src/solaris/doc/sun/man/man1/ja/rmid.1
- src/solaris/doc/sun/man/man1/ja/rmiregistry.1
- src/solaris/doc/sun/man/man1/ja/serialver.1
- src/solaris/doc/sun/man/man1/ja/unpack200.1
- src/solaris/doc/sun/man/man1/jar.1
- src/solaris/doc/sun/man/man1/jarsigner.1
- src/solaris/doc/sun/man/man1/java.1
- src/solaris/doc/sun/man/man1/javac.1
- src/solaris/doc/sun/man/man1/javadoc.1
- src/solaris/doc/sun/man/man1/javap.1
- src/solaris/doc/sun/man/man1/jcmd.1
- src/solaris/doc/sun/man/man1/jconsole.1
- src/solaris/doc/sun/man/man1/jdb.1
- src/solaris/doc/sun/man/man1/jdeps.1
- src/solaris/doc/sun/man/man1/jhat.1
- src/solaris/doc/sun/man/man1/jinfo.1
- src/solaris/doc/sun/man/man1/jjs.1
- src/solaris/doc/sun/man/man1/jmap.1
- src/solaris/doc/sun/man/man1/jps.1
- src/solaris/doc/sun/man/man1/jrunscript.1
- src/solaris/doc/sun/man/man1/jsadebugd.1
- src/solaris/doc/sun/man/man1/jstack.1
- src/solaris/doc/sun/man/man1/jstat.1
- src/solaris/doc/sun/man/man1/jstatd.1
- src/solaris/doc/sun/man/man1/keytool.1
- src/solaris/doc/sun/man/man1/pack200.1
- src/solaris/doc/sun/man/man1/rmic.1
- src/solaris/doc/sun/man/man1/rmid.1
- src/solaris/doc/sun/man/man1/rmiregistry.1
- src/solaris/doc/sun/man/man1/serialver.1
- src/solaris/doc/sun/man/man1/unpack200.1
- test/hotspot/jtreg/compiler/graalunit/CoreSparcTest.java
- test/jdk/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html
- test/jdk/java/awt/event/SequencedEvent/SequencedEventTest.java
- test/jdk/java/util/ResourceBundle/Bug6299235Test.java
- test/jdk/java/util/ResourceBundle/Bug6299235Test.sh
- test/jdk/java/util/ResourceBundle/awtres.jar
- test/jdk/java/util/ResourceBundle/modules/appbasic/appbasic.sh
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/asiabundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/eubundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResourcesProviderImpl.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/appbasic/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/appbasic2.sh
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/asiabundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/jdk/test/resources/eu/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/eubundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResourcesProviderImpl.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/appbasic2/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/basic.sh
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResourcesAsia.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_ja_JP.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/jdk/test/resources/asia/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/asiabundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResourcesEU.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/jdk/test/resources/eu/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/eubundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/asia/MyResources_vi.properties
- test/jdk/java/util/ResourceBundle/modules/basic/src/extra/jdk/test/resources/eu/MyResources_es.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResourcesMain.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/mainbundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/basic/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/layer/run.sh
- test/jdk/java/util/ResourceBundle/modules/modlocal/modlocal.sh
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/extra/jdk/test/resources/MyResources_vi.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/jdk/test/resources/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/modlocal/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/simple/simple.sh
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_de.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_en.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_fr.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_ja.properties
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh.properties
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/MyResources_zh_TW.properties
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/bundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/simple/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/unnamed/unnamed.sh
- test/jdk/java/util/ResourceBundle/modules/visibility/visibility.sh
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_de.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_en.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_fr.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_ja.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/MyResources_zh_TW.xml
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/jdk/test/resources/spi/MyResourcesProvider.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/bundles/module-info.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/jdk/test/Main.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/src/test/module-info.java
- test/jdk/java/util/ResourceBundle/modules/xmlformat/xmlformat.sh
- test/jdk/lib/testlibrary/jdk/testlibrary/OptimalCapacity.java
- test/langtools/tools/jdeps/mrjar/test/Main.java
More information about the amber-dev
mailing list