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

8318983: Fix comment typo in PKCS12Passwd.java #2080

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 22, 2023

I backport this for parity with 17.0.11-oracle.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8318983 needs maintainer approval

Issue

  • JDK-8318983: Fix comment typo in PKCS12Passwd.java (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2080

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 22, 2023

👋 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.

@openjdk openjdk bot changed the title Backport 949846986f572dfb82912e7d71e7bfd37a90871e 8318983: Fix comment typo in PKCS12Passwd.java Dec 22, 2023
@openjdk
Copy link

openjdk bot commented Dec 22, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Dec 22, 2023

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval rfr Pull request is ready for review labels Dec 22, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 22, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 22, 2023

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8318983: Fix comment typo in PKCS12Passwd.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 and removed approval labels Dec 22, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Dec 23, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 23, 2023

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

  • d0eba0d: 8319668: Fixup of jar filename typo in BadFactoryTest.sh
  • c6c4d65: 8316392: compiler/interpreter/TestVerifyStackAfterDeopt.java failed with SIGBUS in PcDescContainer::find_pc_desc_internal
  • dd4da3d: 8316679: C2 SuperWord: wrong result, load should not be moved before store if not comparable
  • 346848d: 8316445: Mark com/sun/management/HotSpotDiagnosticMXBean/CheckOrigin.java as vm.flagless
  • a60492e: 8315920: C2: "control input must dominate current control" assert failure
  • 9a43e9f: 8321972: test runtime/Unsafe/InternalErrorTest.java timeout on linux-riscv64 platform
  • 32fc8a2: 8313816: Accessing jmethodID might lead to spurious crashes
  • c55cc97: 8319456: jdk/jfr/event/gc/collection/TestGCCauseWith[Serial|Parallel].java : GC cause 'GCLocker Initiated GC' not in the valid causes
  • 8e66afb: 8318689: jtreg is confused when folder name is the same as the test name
  • c0b4255: 8305356: Fix ignored bad CompileCommands in tests
  • ... and 2 more: https://git.openjdk.org/jdk17u-dev/compare/4144ef36bcefb0ba597be9c871b15be5043ad231...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 23, 2023

@GoeLin Pushed as commit c6841e0.

💡 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 clean integrated Pull request has been integrated
1 participant