Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 9, 2022

I backport this for parity with 17.0.4-oracle.


Progress

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

Issue

  • JDK-8270021: Incorrect log decorators in gc/g1/plab/TestPLABEvacuationFailure.java

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/215/head:pull/215
$ git checkout pull/215

Update a local copy of the PR:
$ git checkout pull/215
$ git pull https://git.openjdk.java.net/jdk17u-dev pull/215/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 215

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/215.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 9, 2022

👋 Welcome back goetz! 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 openjdk bot changed the title Backport 4a45d95719bf68221e6843572511c2eb741ba69c 8270021: Incorrect log decorators in gc/g1/plab/TestPLABEvacuationFailure.java Mar 9, 2022
@openjdk
Copy link

openjdk bot commented Mar 9, 2022

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 labels Mar 9, 2022
@openjdk
Copy link

openjdk bot commented Mar 9, 2022

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

8270021: Incorrect log decorators in gc/g1/plab/TestPLABEvacuationFailure.java

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 master 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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 9, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 9, 2022

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 10, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 10, 2022

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

  • 3e7cbd2: 8263538: SharedArchiveConsistency.java should test -Xshare:auto as well
  • 97096d8: 8269135: TestDifferentProtectionDomains runs into timeout in client VM
  • ba26525: 8268906: gc/g1/mixedgc/TestOldGenCollectionUsage.java assumes that GCs take 1ms minimum
  • 365e4ce: 8263461: jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java uses wrong mechanism to cause evacuation failure
  • 0d933c9: 8275745: Reproducible copyright headers
  • 673c585: 8279182: MakeZipReproducible ZipEntry timestamps not localized to UTC

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 10, 2022

@GoeLin Pushed as commit f25a8fc.

💡 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