Navigation Menu

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

8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344 #1344

Closed

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Aug 25, 2022

Follow up after JDK-8278344.


Progress

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

Issue

  • JDK-8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1344

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 25, 2022

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into pr/1343 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 01f93ddf18daea5c0798ac949c6717c37d9cefa0 8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344 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

@openjdk openjdk bot removed the clean label Aug 25, 2022
@openjdk-notifier
Copy link

@RealCLanger 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 openjdk bot added the clean label Aug 25, 2022
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1343 to master August 26, 2022 08:56
@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 RealCLanger-backport-01f93ddf
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 Aug 26, 2022
@openjdk openjdk bot added the clean label Aug 26, 2022
@openjdk
Copy link

openjdk bot commented Aug 26, 2022

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

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

8279385: [test]  Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344

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 Aug 26, 2022
@RealCLanger
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 27, 2022

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

  • 351508c: 8287663: Add a regression test for JDK-8287073

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 27, 2022

@RealCLanger Pushed as commit c9f3135.

💡 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-01f93ddf branch August 27, 2022 10:13
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