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

8272850: Drop zapping values in the Zap* option descriptions #5223

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 23, 2021

Removing a little debugging pitfall. See the bug report for more discussion.
Since this does not touch any product option, I don't believe it requires a CSR.


Progress

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

Issue

  • JDK-8272850: Drop zapping values in the Zap* option descriptions

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5223/head:pull/5223
$ git checkout pull/5223

Update a local copy of the PR:
$ git checkout pull/5223
$ git pull https://git.openjdk.java.net/jdk pull/5223/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5223

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5223.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 23, 2021

👋 Welcome back shade! 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 added the rfr Pull request is ready for review label Aug 23, 2021
@openjdk
Copy link

openjdk bot commented Aug 23, 2021

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Aug 23, 2021
@mlbridge
Copy link

mlbridge bot commented Aug 23, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 24, 2021

@shipilev 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:

8272850: Drop zapping values in the Zap* option descriptions

Reviewed-by: stefank, kbarrett

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 6 new commits pushed to the master branch:

  • 22ef4f0: 5015261: NPE may be thrown if JDesktopIcon is set to null on a JInternalFrame
  • 9bc0232: 8269223: -Xcheck:jni WARNINGs working with fonts on Linux
  • 2ff4c01: 8271600: C2: CheckCastPP which should closely follow Allocate is sunk of a loop
  • ad92033: 8272736: [JVMCI] Add API for reading and writing JVMCI thread locals
  • 709b591: 8272553: several hotspot runtime/CommandLine tests don't check exit code
  • 1884072: 8265253: javac -Xdoclint:all gives "no comment" warning for code that can't be commented

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 24, 2021
Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@shipilev
Copy link
Member Author

Thanks for reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 25, 2021

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

  • 1e3e333: 8272884: Make VoidClosure::do_void pure virtual
  • 0f428ca: 8272570: C2: crash in PhaseCFG::global_code_motion
  • b17b821: 8272639: jpackaged applications using microphone on mac
  • 0e7288f: 8267125: AES Galois CounterMode (GCM) interleaved implementation using AVX512 + VAES instructions
  • 6ace805: 8272856: DoubleFlagWithIntegerValue uses G1GC-only flag
  • c547ead: 8272916: Copyright year was modified unintentionally in jlink.properties and ImagePluginStack.java
  • aaedac6: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • d34f17c: 8270195: Add missing links between methods of JavaFX properties
  • f608e81: 8264322: Generate CDS archive when creating custom JDK image
  • f681d65: 8272806: [macOS] "Apple AWT Internal Exception" when input method is changed
  • ... and 13 more: https://git.openjdk.java.net/jdk/compare/594e5161b48382d61509b4969bc8f52c3c076452...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 25, 2021

@shipilev Pushed as commit c5a2712.

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

@shipilev shipilev deleted the JDK-8272850-options-zap-descs branch August 27, 2021 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants