Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge lworld #352

Conversation

MrSimms
Copy link
Member

@MrSimms MrSimms commented Feb 25, 2021

Merge tag 'jdk-17+11'

Conflicts:

src/hotspot/share/classfile/classFileParser.cpp

src/hotspot/share/classfile/classFileParser.hpp

src/hotspot/share/oops/instanceKlass.hpp

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java


Progress

  • Change must not contain extraneous whitespace

Download

$ git fetch https://git.openjdk.java.net/valhalla pull/352/head:pull/352
$ git checkout pull/352

Xin Liu and others added 30 commits Feb 17, 2021
…nd comparison methods

Reviewed-by: bpb, smarks, rriggs
…Serial/Parallel GC

Reviewed-by: shade, ayang, sjohanss
…) failed: conversion check

Reviewed-by: thartmann, kvn
…etect too small InitialHeapSize

Reviewed-by: tschatzl, sjohanss
…sed with hugetlb large pages

Reviewed-by: stuefe, tschatzl
…ertificate as specified by RFC 5280

Reviewed-by: coffeys, mullan, weijun
Reviewed-by: bpb, joehw, rriggs, darcy
…acy updating of peak values

Reviewed-by: dholmes, shade
…ave the 'Open' button when select 'subdir' folder with NimbusLAF

Reviewed-by: aivanov
Daniel D. Daugherty and others added 16 commits Feb 23, 2021
…ratedClasses.java on Windows

Reviewed-by: rriggs, bpb
…hen launching fails

Reviewed-by: iklam, cjplummer
…ing/returning a connection to the pool

Reviewed-by: chegar, michaelm
…e_gen_kill_single

Reviewed-by: stuefe, thartmann
…eException: Expected log was not emitted. LogRecord: null"

Reviewed-by: joehw, dfuchs
…d ReplayCacheTestProcWithMD5.java failed on OL8.3

Reviewed-by: weijun, rhalade
… implement PrimitiveObject

Reviewed-by: fparain
Merge tag 'jdk-17+11'
# Conflicts:
#	src/hotspot/share/classfile/classFileParser.cpp
#	src/hotspot/share/classfile/classFileParser.hpp
#	src/hotspot/share/oops/instanceKlass.hpp
#	src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java
@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 25, 2021

/summary Merge tag 'jdk-17+11'

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 25, 2021

👋 Welcome back dsimms! A progress list of the required criteria for merging this PR into type-restrictions will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Feb 25, 2021

@MrSimms This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

Merge lworld

Merge tag 'jdk-17+11'

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the type-restrictions branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the type-restrictions branch, type /integrate in a new comment.

@openjdk
Copy link

@openjdk openjdk bot commented Feb 25, 2021

@MrSimms Setting summary to Merge tag 'jdk-17+11'

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 25, 2021

@MrSimms
Copy link
Member Author

@MrSimms MrSimms commented Feb 25, 2021

/integrate

@openjdk openjdk bot closed this Feb 25, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Feb 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 25, 2021

@MrSimms Pushed as commit 0a26489.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@MrSimms MrSimms deleted the type-restrictions_merge_lworld_17_11 branch Feb 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment