Skip to content

8294740: Add cgroups keyword to TestDockerBasic.java #795

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

Closed
wants to merge 1 commit into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Oct 14, 2022

Clean backport. Just adds a @cgroups tag to a test added with #785.


Progress

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

Issue

  • JDK-8294740: Add cgroups keyword to TestDockerBasic.java

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 795

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 14, 2022

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/785 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 ae79af2ad67b51a7608f4c9060421dd175cabf3f 8294740: Add cgroups keyword to TestDockerBasic.java Oct 14, 2022
@openjdk
Copy link

openjdk bot commented Oct 14, 2022

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

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

mlbridge bot commented Oct 14, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/785 to master October 14, 2022 14:44
@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 jdk-8294740-backport
git fetch https://git.openjdk.org/jdk17u-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 openjdk bot removed the clean label Oct 14, 2022
@jerboaa jerboaa force-pushed the jdk-8294740-backport branch from ceab453 to 4985c50 Compare October 14, 2022 15:20
@openjdk openjdk bot added the clean label Oct 14, 2022
@openjdk
Copy link

openjdk bot commented Oct 14, 2022

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

8294740: Add cgroups keyword to TestDockerBasic.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 the ready Pull request is ready to be integrated label Oct 14, 2022
@openjdk-notifier
Copy link

@jerboaa 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.

@jerboaa
Copy link
Contributor Author

jerboaa commented Oct 17, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 17, 2022

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

  • a721e37: 8283353: compiler/c2/cr6865031/Test.java and compiler/runtime/Test6826736.java fails on x86_32
  • d613b78: 8293672: Update freetype md file

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 17, 2022

@jerboaa Pushed as commit 9498440.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants