Skip to content
Permalink
Browse files
8280543: Update the "java" and "jcmd" tool specification for CDS
Reviewed-by: hseigel, sspitsyn, ccheung
  • Loading branch information
iklam committed Jan 31, 2022
1 parent f991891 commit 39165613aa0430861e361a33a4925b85ea24fff1
Showing 2 changed files with 145 additions and 474 deletions.

3 comments on commit 3916561

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 3916561 Jan 31, 2022

Choose a reason for hiding this comment

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

@tstuefe
Copy link
Member

@tstuefe tstuefe commented on 3916561 Mar 22, 2022

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 3916561 Mar 22, 2022

Choose a reason for hiding this comment

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

@tstuefe Could not automatically backport 39165613 to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/jdk.jcmd/share/man/jcmd.1

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk17u-dev:

$ git checkout -b tstuefe-backport-39165613
$ git fetch --no-tags https://git.openjdk.java.net/jdk 39165613aa0430861e361a33a4925b85ea24fff1
$ git cherry-pick --no-commit 39165613aa0430861e361a33a4925b85ea24fff1
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 39165613aa0430861e361a33a4925b85ea24fff1'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 39165613aa0430861e361a33a4925b85ea24fff1.

Please sign in to comment.