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 openjdk/jdk21u:master #152

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented Jan 23, 2025

Merges tag jdk-21.0.6-ga


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/shenandoah-jdk21u.git pull/152/head:pull/152
$ git checkout pull/152

Update a local copy of the PR:
$ git checkout pull/152
$ git pull https://git.openjdk.org/shenandoah-jdk21u.git pull/152/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 152

View PR using the GUI difftool:
$ git pr show -t 152

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/shenandoah-jdk21u/pull/152.diff

martinuy and others added 5 commits January 4, 2025 20:55
Backport-of: 727c2612766dd1737bf59fb0d9ba1e58a7b8c32b
Reviewed-by: mbalao
Backport-of: 978dfdf9aa95da4196055cc288c5993d4dc6ef85
Reviewed-by: yan, mbalao
Backport-of: 6e7f9a23a4daf461acbc4c5a5110e19b34ced22c
Reviewed-by: yan
Backport-of: a71624a69ec5cc8600f2a3a53c23c75b43068830
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 23, 2025

👋 Welcome back wkemper! A progress list of the required criteria for merging this PR into master 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 bot commented Jan 23, 2025

@earthling-amzn 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

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 141 new commits pushed to the master branch:

  • 31e89a5: 8345750: Shenandoah: Test TestJcmdHeapDump.java#aggressive intermittent assert(gc_cause() == GCCause::_no_gc) failed: Over-writing cause
  • 3c538ce: 8346737: GenShen: Generational memory pools should not report zero for maximum capacity
  • ae45b94: 8346690: Shenandoah: Fix log message for end of GC usage report
  • 48cd85f: 8346688: GenShen: Missing metadata trigger log message
  • 463eb23: 8346681: Shenandoah: Does not throw OOME when EATests expects it
  • 1d7e999: 8345970: pthread_getcpuclockid related crashes in shenandoah tests
  • b0898ae: 8346051: MemoryTest fails when Shenandoah's generational mode is enabled
  • 71c448f: 8342214: GenShen: Reduce code duplication in shFreeSet with iterator abstraction
  • 562224c: 8346044: GenShen: ShenandoahGenerationalHeap entry missing from Universe.java
  • 842a0d8: 8342001: GenShen: Factor cases for allocation type into separate methods
  • ... and 131 more: https://git.openjdk.org/shenandoah-jdk21u/compare/e45287d1ad9dcadf8a23d3271f1b675b8dade0ac...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot added ready Pull request is ready to be integrated clean rfr Pull request is ready for review labels Jan 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clean ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants