Skip to content

Conversation

@earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented Jul 12, 2024

Trivial conflict with not-yet-backported improvements to OOM handling.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8335347: GenShen: Revert change that has adaptive heuristic ignore abbreviated cycles (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 67

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 12, 2024

👋 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 Jul 12, 2024

@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:

8335347: GenShen: Revert change that has adaptive heuristic ignore abbreviated cycles

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

  • 645a499: Merge
  • a0b3c6c: 8334441: Mark tests in jdk_security_infra group as manual

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 changed the title Backport 7542e909d1b4fb8a9a29ab5caf61a6be792f0f03 8335347: GenShen: Revert change that has adaptive heuristic ignore abbreviated cycles Jul 12, 2024
@openjdk
Copy link

openjdk bot commented Jul 12, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 12, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 12, 2024

Webrevs

@earthling-amzn
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 12, 2024

Going to push as commit acb6b5f.
Since your change was applied there have been 3 commits pushed to the master branch:

  • 8e2bc91: 8334491: GenShen: Revert changes to Shenandoah defaults
  • 645a499: Merge
  • a0b3c6c: 8334441: Mark tests in jdk_security_infra group as manual

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 12, 2024
@openjdk openjdk bot closed this Jul 12, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 12, 2024
@openjdk
Copy link

openjdk bot commented Jul 12, 2024

@earthling-amzn Pushed as commit acb6b5f.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant