hg: amber/amber: Automatic merge with default
maurizio.cimadamore at oracle.com
maurizio.cimadamore at oracle.com
Thu Feb 28 21:05:44 UTC 2019
Changeset: cfe047f11020
Author: mcimadamore
Date: 2019-02-28 22:05 +0100
URL: http://hg.openjdk.java.net/amber/amber/rev/cfe047f11020
Automatic merge with default
- src/hotspot/share/prims/evmCompat.cpp
- src/hotspot/share/utilities/intHisto.cpp
- src/hotspot/share/utilities/intHisto.hpp
- src/java.smartcardio/unix/native/libj2pcsc/MUSCLE/COPYING
- src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotatedType.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationDesc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/AnnotationValue.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ClassDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ConstructorDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/Doc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/DocErrorReporter.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/Doclet.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ExecutableMemberDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/FieldDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/LanguageVersion.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/MemberDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/MethodDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/PackageDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ParamTag.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/Parameter.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ParameterizedType.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ProgramElementDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/RootDoc.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/SeeTag.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/SerialFieldTag.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/SourcePosition.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/Tag.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/ThrowsTag.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/Type.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/TypeVariable.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/WildcardType.java
- src/jdk.javadoc/share/classes/com/sun/javadoc/package-info.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/Standard.java
- src/jdk.javadoc/share/classes/com/sun/tools/doclets/standard/package-info.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/Main.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AbstractTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotatedTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationDescImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationTypeElementDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/AnnotationValueImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ClassDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Comment.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ConstructorDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocEnv.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocLocale.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/DocletInvoker.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ExecutableMemberDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/FieldDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavaScriptScanner.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocClassFinder.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocEnter.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocMemberEnter.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTodo.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/JavadocTool.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MemberDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/MethodDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ModifierFilter.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PackageDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParamTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ParameterizedTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/PrimitiveType.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ProgramElementDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/RootDocImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SeeTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerialFieldTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SerializedForm.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/SourcePositionImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ThrowsTagImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeMaker.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/TypeVariableImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/WildcardTypeImpl.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/package-info.java
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties
- src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Headings.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MarkerComments.java
- src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/StripDebugPlugin.java
- test/hotspot/gtest/memory/test_virtualSpaceNode.cpp
- test/jdk/tools/jlink/plugins/StripDebugPluginTest.java
- test/langtools/jdk/javadoc/lib/javadoc/tester/ShowHeadings.java
- test/langtools/jdk/javadoc/tool/api/basic/GetTask_DocletClassTest.java
- test/langtools/tools/javadoc/6176978/T6176978.java
- test/langtools/tools/javadoc/6176978/X.java
- test/langtools/tools/javadoc/6227454/Test.java
- test/langtools/tools/javadoc/6942366/T6942366.java
- test/langtools/tools/javadoc/6942366/Test.java
- test/langtools/tools/javadoc/6942366/p/Base.java
- test/langtools/tools/javadoc/6958836/Test.java
- test/langtools/tools/javadoc/6964914/Error.java
- test/langtools/tools/javadoc/6964914/JavacWarning.java
- test/langtools/tools/javadoc/6964914/JavadocWarning.java
- test/langtools/tools/javadoc/6964914/Test.java
- test/langtools/tools/javadoc/6964914/TestStdDoclet.java
- test/langtools/tools/javadoc/6964914/TestUserDoclet.java
- test/langtools/tools/javadoc/8025693/Test.java
- test/langtools/tools/javadoc/8147801/T8147801.java
- test/langtools/tools/javadoc/8147801/jarsrc/lib/Lib1.java
- test/langtools/tools/javadoc/8147801/jarsrc/lib/Lib2.java
- test/langtools/tools/javadoc/8147801/p/Test.java
- test/langtools/tools/javadoc/AddOpensTest.java
- test/langtools/tools/javadoc/BadOptionsTest.java
- test/langtools/tools/javadoc/BooleanConst.java
- test/langtools/tools/javadoc/BreakIteratorWarning.java
- test/langtools/tools/javadoc/CheckResourceKeys.java
- test/langtools/tools/javadoc/CompletionError.java
- test/langtools/tools/javadoc/EncodingTest.java
- test/langtools/tools/javadoc/FlagsTooEarly.java
- test/langtools/tools/javadoc/InlineTagsWithBraces.java
- test/langtools/tools/javadoc/LangVers.java
- test/langtools/tools/javadoc/MaxWarns.java
- test/langtools/tools/javadoc/MethodLinks.java
- test/langtools/tools/javadoc/NoStar.java
- test/langtools/tools/javadoc/ReleaseOption.java
- test/langtools/tools/javadoc/ReleaseOptionSource.java
- test/langtools/tools/javadoc/T4994049/FileWithTabs.java
- test/langtools/tools/javadoc/T4994049/T4994049.java
- test/langtools/tools/javadoc/T6968833.java
- test/langtools/tools/javadoc/XWerror.java
- test/langtools/tools/javadoc/annotations/annotateMethodsFields/Main.java
- test/langtools/tools/javadoc/annotations/annotateMethodsFields/expected.out
- test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java
- test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java
- test/langtools/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java
- test/langtools/tools/javadoc/annotations/annotatePackage/Main.java
- test/langtools/tools/javadoc/annotations/annotatePackage/expected.out
- test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/A.java
- test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java
- test/langtools/tools/javadoc/annotations/annotatePackage/pkg1/package.html
- test/langtools/tools/javadoc/annotations/annotatePackage/pkg2/B.java
- test/langtools/tools/javadoc/annotations/annotatePackage/pkg2/package.html
- test/langtools/tools/javadoc/annotations/annotateParams/Main.java
- test/langtools/tools/javadoc/annotations/annotateParams/expected.out
- test/langtools/tools/javadoc/annotations/annotateParams/pkg1/A.java
- test/langtools/tools/javadoc/annotations/annotateParams/pkg1/C.java
- test/langtools/tools/javadoc/annotations/badVals/Main.java
- test/langtools/tools/javadoc/annotations/badVals/pkg1/A.java
- test/langtools/tools/javadoc/annotations/defaults/Main.java
- test/langtools/tools/javadoc/annotations/defaults/expected.out
- test/langtools/tools/javadoc/annotations/defaults/pkg1/A.java
- test/langtools/tools/javadoc/annotations/defaults/pkg1/B.java
- test/langtools/tools/javadoc/annotations/elementTypes/Main.java
- test/langtools/tools/javadoc/annotations/elementTypes/expected.out
- test/langtools/tools/javadoc/annotations/elementTypes/pkg1/A.java
- test/langtools/tools/javadoc/annotations/elementTypes/pkg1/B.java
- test/langtools/tools/javadoc/annotations/missing/Main.java
- test/langtools/tools/javadoc/annotations/missing/somepackage/MissingAnnotationClass.java
- test/langtools/tools/javadoc/annotations/shortcuts/Main.java
- test/langtools/tools/javadoc/annotations/shortcuts/expected.out
- test/langtools/tools/javadoc/annotations/shortcuts/pkg1/A.java
- test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Array.java
- test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Marker.java
- test/langtools/tools/javadoc/annotations/shortcuts/pkg1/Value.java
- test/langtools/tools/javadoc/api/basic/APITest.java
- test/langtools/tools/javadoc/api/basic/DocletPathTest.java
- test/langtools/tools/javadoc/api/basic/DocumentationToolLocationTest.java
- test/langtools/tools/javadoc/api/basic/GetSourceVersionsTest.java
- test/langtools/tools/javadoc/api/basic/GetTask_DiagListenerTest.java
- test/langtools/tools/javadoc/api/basic/GetTask_DocletClassTest.java
- test/langtools/tools/javadoc/api/basic/GetTask_FileManagerTest.java
- test/langtools/tools/javadoc/api/basic/GetTask_FileObjectsTest.java
- test/langtools/tools/javadoc/api/basic/GetTask_OptionsTest.java
- test/langtools/tools/javadoc/api/basic/GetTask_WriterTest.java
- test/langtools/tools/javadoc/api/basic/Task_reuseTest.java
- test/langtools/tools/javadoc/api/basic/pkg/C.java
- test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
- test/langtools/tools/javadoc/completionFailure/CompletionFailure.java
- test/langtools/tools/javadoc/completionFailure/pkg/A.java
- test/langtools/tools/javadoc/completionFailure/pkg/B.java
- test/langtools/tools/javadoc/dupOk/DupOk.java
- test/langtools/tools/javadoc/dupOk/sp1/p/A.java
- test/langtools/tools/javadoc/dupOk/sp2/p/A.java
- test/langtools/tools/javadoc/dupOk/sp2/p/B.java
- test/langtools/tools/javadoc/enum/docComments/Main.java
- test/langtools/tools/javadoc/enum/docComments/pkg1/Operation.java
- test/langtools/tools/javadoc/enum/enumType/Main.java
- test/langtools/tools/javadoc/enum/enumType/expected.out
- test/langtools/tools/javadoc/enum/enumType/pkg1/QuotablePerson.java
- test/langtools/tools/javadoc/generics/genericClass/Main.java
- test/langtools/tools/javadoc/generics/genericClass/expected.out
- test/langtools/tools/javadoc/generics/genericClass/pkg1/A.java
- test/langtools/tools/javadoc/generics/genericInnerAndOuter/Main.java
- test/langtools/tools/javadoc/generics/genericInnerAndOuter/expected.out
- test/langtools/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java
- test/langtools/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java
- test/langtools/tools/javadoc/generics/genericInterface/Main.java
- test/langtools/tools/javadoc/generics/genericInterface/expected.out
- test/langtools/tools/javadoc/generics/genericInterface/pkg1/A.java
- test/langtools/tools/javadoc/generics/genericMethod/Main.java
- test/langtools/tools/javadoc/generics/genericMethod/expected.out
- test/langtools/tools/javadoc/generics/genericMethod/pkg1/A.java
- test/langtools/tools/javadoc/generics/genericSuper/Main.java
- test/langtools/tools/javadoc/generics/genericSuper/expected.out
- test/langtools/tools/javadoc/generics/genericSuper/pkg1/A.java
- test/langtools/tools/javadoc/generics/supertypes/Main.java
- test/langtools/tools/javadoc/generics/supertypes/expected.out
- test/langtools/tools/javadoc/generics/supertypes/pkg1/A.java
- test/langtools/tools/javadoc/generics/supertypes/pkg1/B.java
- test/langtools/tools/javadoc/generics/throwsGeneric/Main.java
- test/langtools/tools/javadoc/generics/throwsGeneric/expected.out
- test/langtools/tools/javadoc/generics/throwsGeneric/pkg1/A.java
- test/langtools/tools/javadoc/generics/tparamCycle/Main.java
- test/langtools/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java
- test/langtools/tools/javadoc/generics/tparamTagOnMethod/Main.java
- test/langtools/tools/javadoc/generics/tparamTagOnMethod/expected.out
- test/langtools/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java
- test/langtools/tools/javadoc/generics/tparamTagOnType/Main.java
- test/langtools/tools/javadoc/generics/tparamTagOnType/expected.out
- test/langtools/tools/javadoc/generics/tparamTagOnType/pkg1/A.java
- test/langtools/tools/javadoc/generics/wildcards/Main.java
- test/langtools/tools/javadoc/generics/wildcards/expected.out
- test/langtools/tools/javadoc/generics/wildcards/pkg1/A.java
- test/langtools/tools/javadoc/imports/I.java
- test/langtools/tools/javadoc/imports/MissingImport.java
- test/langtools/tools/javadoc/lib/OldToolTester.java
- test/langtools/tools/javadoc/lib/ToyDoclet.java
- test/langtools/tools/javadoc/nestedClass/NestedClass.java
- test/langtools/tools/javadoc/nestedClass/NestedClassB.java
- test/langtools/tools/javadoc/nonConstExprs/Test.java
- test/langtools/tools/javadoc/outputRedirect/Test.java
- test/langtools/tools/javadoc/outputRedirect/p/OutputRedirect.java
- test/langtools/tools/javadoc/parser/7091528/T7091528.java
- test/langtools/tools/javadoc/parser/7091528/p/C1.java
- test/langtools/tools/javadoc/parser/7091528/p/C3.java
- test/langtools/tools/javadoc/parser/7091528/p/q/C2.java
- test/langtools/tools/javadoc/sourceOnly/Test.java
- test/langtools/tools/javadoc/sourceOnly/p/NonSource.jasm
- test/langtools/tools/javadoc/sourceOnly/p/SourceOnly.java
- test/langtools/tools/javadoc/sourceOption/SourceOption.java
- test/langtools/tools/javadoc/sourceOption/p/LambdaConstructTest.java
- test/langtools/tools/javadoc/subpackageIgnore/SubpackageIgnore.java
- test/langtools/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java
- test/langtools/tools/javadoc/varArgs/Main.java
- test/langtools/tools/javadoc/varArgs/expected.out
- test/langtools/tools/javadoc/varArgs/pkg1/A.java
More information about the amber-dev
mailing list