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

8292682: Code change of JDK-8282730 not updated to reflect CSR update #1492

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Nov 2, 2022

I backport this for parity with 11.0.18-oracle.


Progress

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

Issue

  • JDK-8292682: Code change of JDK-8282730 not updated to reflect CSR update

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1492

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 2, 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.

@GoeLin GoeLin changed the base branch from master to pr/1491 November 3, 2022 08:32
@GoeLin GoeLin changed the title Goetz backport 8292682 Backport 74d3330e106f2f920bf264356e4f25f8f6c11580 Nov 3, 2022
@openjdk openjdk bot changed the title Backport 74d3330e106f2f920bf264356e4f25f8f6c11580 8292682: Code change of JDK-8282730 not updated to reflect CSR update Nov 3, 2022
@openjdk
Copy link

openjdk bot commented Nov 3, 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 Nov 3, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Nov 3, 2022

Pre-submit failure: java/util/DoubleStreamSums/CompensatedSums; known to be failing. unrelated.

@mlbridge
Copy link

mlbridge bot commented Nov 3, 2022

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1491 to master November 4, 2022 08:02
@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 goetz_backport_8292682
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 removed the clean label Nov 4, 2022
@openjdk openjdk bot added the clean label Nov 4, 2022
@openjdk
Copy link

openjdk bot commented Nov 4, 2022

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

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

8292682: Code change of JDK-8282730 not updated to reflect CSR update

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 Nov 4, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Nov 4, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Nov 4, 2022

Going to push as commit f24340a.

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

openjdk bot commented Nov 4, 2022

@GoeLin Pushed as commit f24340a.

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

@GoeLin GoeLin deleted the goetz_backport_8292682 branch November 4, 2022 08:19
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
1 participant