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

8310512: Cleanup indentation in jfc files #14579

Closed
wants to merge 1 commit into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Jun 21, 2023

Trivial whitespace cleanup in JFR jfc files.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8310512: Cleanup indentation in jfc files (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14579/head:pull/14579
$ git checkout pull/14579

Update a local copy of the PR:
$ git checkout pull/14579
$ git pull https://git.openjdk.org/jdk.git pull/14579/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14579

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14579.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 21, 2023

👋 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 added the rfr Pull request is ready for review label Jun 21, 2023
@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

  • hotspot-jfr

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-jfr hotspot-jfr-dev@openjdk.org label Jun 21, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 21, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

8310512: Cleanup indentation in jfc files

Reviewed-by: egahlin

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 Jun 21, 2023
@RealCLanger
Copy link
Contributor Author

Thanks for the review

/integrate

@openjdk
Copy link

openjdk bot commented Jun 21, 2023

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

  • f286e5a: 8310575: no @since for StandardDoclet
  • 16a34e8: 8310384: Add hooks for custom image creation
  • 226c6a0: 8309883: no @since info in com.sun.tools.javac package-info.java, Main.java
  • fd1163d: 8310332: Fix -Wconversion warnings in MethodData
  • 72501cf: 8310379: Relax prerequisites for java.base-jmod target
  • 59c6c0e: 8310335: JFR: Modernize collections and switch statements
  • 826dcb5: 8264899: C1: -XX:AbortVMOnException does not work if all methods in the call stack are compiled with C1 and there are no exception handlers
  • 658c337: 8309296: jdk/jfr/event/runtime/TestAgentEvent.java fails due to "missing" dynamic JavaAgent
  • 70e1c92: 8310297: assert(static_cast(result) == thing) with ctw
  • 574c6f0: 8310376: Extend SetupTarget macro with DIR parameter
  • ... and 3 more: https://git.openjdk.org/jdk/compare/67fbd87378a9b3861f1676977f9f2b36052add29...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 21, 2023

@RealCLanger Pushed as commit 3be50da.

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

@RealCLanger RealCLanger deleted the JDK-8310512 branch June 21, 2023 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-jfr hotspot-jfr-dev@openjdk.org integrated Pull request has been integrated
2 participants