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

8262379: Add regression test for JDK-8257746 #171

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link
Contributor

@jmtd jmtd commented Nov 14, 2022

This is a backport of 8262379: Add regression test for JDK-8257746 for jdk8u-dev as part of cgroups v2 support.


Progress

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

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/171/head:pull/171
$ git checkout pull/171

Update a local copy of the PR:
$ git checkout pull/171
$ git pull https://git.openjdk.org/jdk8u-dev pull/171/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 171

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/171.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 14, 2022

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/170 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 4c9adce20d114a3df629fa8c72d88795039ae69a 8262379: Add regression test for JDK-8257746 Nov 14, 2022
@openjdk
Copy link

openjdk bot commented Nov 14, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 14, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 14, 2022

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@openjdk
Copy link

openjdk bot commented Dec 12, 2022

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8262379-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 16, 2022

@jmtd this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8262379-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 16, 2022
Backport-of: 4c9adce20d114a3df629fa8c72d88795039ae69a
@openjdk
Copy link

openjdk bot commented Dec 16, 2022

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Dec 16, 2022

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

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

8262379: Add regression test for JDK-8257746

Reviewed-by: sgehwolf

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 and removed merge-conflict Pull request has merge conflict with target branch labels Dec 16, 2022
Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good. Feel free to integrate and then rebase #175. Thank you!

@jmtd
Copy link
Contributor Author

jmtd commented Dec 16, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 16, 2022

Going to push as commit d7b14be.

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

openjdk bot commented Dec 16, 2022

@jmtd Pushed as commit d7b14be.

💡 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 integrated Pull request has been integrated
2 participants