Skip to content

Conversation

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 9, 2021

Backport of JDK-8210353. Needed trivial resolve - but bots recognize it as clean. Diff looks same as original.


Progress

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

Issue

  • JDK-8210353: Move java/util/Arrays/TimSortStackSize2.java back to tier1

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 321

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 9, 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 a0594bc1380c85420fc87e9136c55d2b8c7ab7a1 8210353: Move java/util/Arrays/TimSortStackSize2.java back to tier1 Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 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 Sep 9, 2021
@openjdk
Copy link

openjdk bot commented Sep 9, 2021

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

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

8210353: Move java/util/Arrays/TimSortStackSize2.java back to tier1

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 Sep 9, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 9, 2021

Webrevs

@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 11, 2021

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

  • 5a5d246: 8195703: BasicJDWPConnectionTest.java: 'App exited unexpectedly with 2'
  • 180bc52: 8272966: test/jdk/java/awt/Robot/FlushCurrentEvent.java fails by timeout
  • bfb52f2: 8273547: [11u] [JVMCI] Partial module-info.java backport of JDK-8223332
  • 1e6682a: 8247403: JShell: No custom input (e.g. from GUI) possible with JavaShellToolBuilder
  • 4ea2edd: 8260690: JConsole User Guide Link from the Help menu is not accessible by keyboard
  • a39375e: 8256372: [macos] Unexpected symbol was displayed on JTextField with Monospaced font
  • a013fe2: 8210395: Add doc to SecurityTools.java

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 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 Sep 11, 2021
@openjdk
Copy link

openjdk bot commented Sep 11, 2021

@RealCLanger Pushed as commit dee030c.

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

@RealCLanger RealCLanger deleted the RealCLanger-backport-a0594bc1 branch September 11, 2021 05:39
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