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

8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete #1345

Closed
wants to merge 1 commit into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Aug 25, 2022

Follow-up backport (for hotspot) to https://bugs.openjdk.org/browse/JDK-8287107 applies clean.


Progress

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

Issue

  • JDK-8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1345

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 25, 2022

👋 Welcome back sgehwolf! A progress list of the required criteria for merging this PR into pr/1340 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 8d28734ede0ed3922c92451a172d1fa676e484e9 8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete Aug 25, 2022
@openjdk
Copy link

openjdk bot commented Aug 25, 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 Aug 25, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 25, 2022

Webrevs

@jerboaa jerboaa force-pushed the jdk-8287741-freezer-followup branch from 26f635c to 3e47fb3 Compare August 26, 2022 08:41
@openjdk openjdk bot removed the clean label Aug 26, 2022
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1340 to master August 26, 2022 08:43
@openjdk-notifier
Copy link

The dependent pull request 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-8287741-freezer-followup
git fetch https://git.openjdk.org/jdk11u-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 added the clean label Aug 26, 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.

@openjdk
Copy link

openjdk bot commented Aug 26, 2022

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

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

8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete

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 1 new commit pushed to the master branch:

  • 1afd1f4: 8287073: NPE from CgroupV2Subsystem.getInstance()

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 added the ready Pull request is ready to be integrated label Aug 26, 2022
@jerboaa
Copy link
Contributor Author

jerboaa commented Aug 26, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Aug 26, 2022

Going to push as commit 90a6418.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 1afd1f4: 8287073: NPE from CgroupV2Subsystem.getInstance()

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 26, 2022

@jerboaa Pushed as commit 90a6418.

💡 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.

1 participant