Skip to content

Conversation

@tstuefe
Copy link
Member

@tstuefe tstuefe commented Nov 1, 2020


Progress

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

Testing

Linux x64 Linux x86 Windows x64 macOS x64
Build ⏳ (1/5 running) ✔️ (2/2 passed) ⏳ (1/2 running) ✔️ (2/2 passed)
Test (tier1) ⏳ (4/9 running) ⏳ (7/9 running)

Download

$ git fetch https://git.openjdk.java.net/jdk pull/982/head:pull/982
$ git checkout pull/982

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 1, 2020

👋 Welcome back stuefe! 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
Copy link

openjdk bot commented Nov 1, 2020

@tstuefe The following label will be automatically applied to this pull request:

  • hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Nov 1, 2020
@openjdk
Copy link

openjdk bot commented Nov 2, 2020

@tstuefe this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout signals-cleanup-work
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 2, 2020
@tstuefe tstuefe force-pushed the signals-cleanup-work branch from f165efe to dc8800d Compare November 2, 2020 13:57
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Nov 2, 2020
@tstuefe tstuefe force-pushed the signals-cleanup-work branch 2 times, most recently from b4e433f to 3c2b3dc Compare November 3, 2020 06:04
@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Nov 3, 2020
@tstuefe tstuefe force-pushed the signals-cleanup-work branch from 3c2b3dc to d665784 Compare November 3, 2020 08:20
@tstuefe
Copy link
Member Author

tstuefe commented Nov 3, 2020

Closed, this moved to a new branch.

@tstuefe tstuefe closed this Nov 3, 2020
@tstuefe tstuefe deleted the signals-cleanup-work branch November 4, 2020 05:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot hotspot-dev@openjdk.org merge-conflict Pull request has merge conflict with target branch

Development

Successfully merging this pull request may close these issues.

1 participant