Skip to content

Conversation

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 8, 2021

Hi all,

this pull request contains a backport of JDK-8242793 from the openjdk/jdk repository.

The commit being backported was authored by Richard Reingruber on 15 Apr 2020 and was reviewed by Vladimir Kozlov.

Thanks!


Progress

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

Issue

  • JDK-8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 495

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 8, 2021

👋 Welcome back clanger! 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 25cd1774a76e6e7519291f2e18ab25c2c76df255 8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.java Oct 8, 2021
@openjdk
Copy link

openjdk bot commented Oct 8, 2021

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 Oct 8, 2021
@openjdk
Copy link

openjdk bot commented Oct 8, 2021

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

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

8242793: Incorrect copyright header in ContinuousCallSiteTargetChange.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 Oct 8, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 8, 2021

Webrevs

@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 11, 2021

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

  • 82491fd: 7105119: [TEST_BUG] [macosx] In test UIDefaults.toString() must be called with the invokeLater()
  • d66464e: 8237589: Fix copyright header formatting
  • 75b513f: 8243543: jtreg test security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java fails
  • 84fc3b7: 8211148: var in implicit lambdas shouldn't be accepted for source < 11
  • 65cab1e: 8198616: java/awt/Focus/6378278/InputVerifierTest.java fails on mac
  • 158c0a8: 8274642: jdk/jshell/CommandCompletionTest.java fails with NoSuchElementException after JDK-8271287
  • a88c738: 8271287: jdk/jshell/CommandCompletionTest.java fails with "lists don't have the same size expected"
  • f79ceaf: 8273498: compiler/c2/Test7179138_1.java timed out
  • eeab2f1: 8273229: Update OS detection code to recognize Windows Server 2022

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 11, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 11, 2021
@openjdk
Copy link

openjdk bot commented Oct 11, 2021

@RealCLanger Pushed as commit 4e63adb.

💡 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