Skip to content

Commit

Permalink
8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file
Browse files Browse the repository at this point in the history 
Reviewed-by: gdams, stuefe
  • Loading branch information
@jerboaa
jerboaa committed Jul 5, 2024
1 parent 194425d commit ff49f67
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/*
s
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
Expand Down

7 comments on commit ff49f67

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@gnu-andrew
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on ff49f67 Jul 5, 2024

Choose a reason for hiding this comment

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

@gnu-andrew Could not automatically backport ff49f677 to openjdk/jdk21u-dev due to conflicts in the following files:

  • test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/functions/rawmonitor/rawmonitor.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-gnu-andrew-ff49f677-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git ff49f677ee5017019c90823bc412ceb90068ffbd

# Backport the commit
$ git cherry-pick --no-commit ff49f677ee5017019c90823bc412ceb90068ffbd
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport ff49f677ee5017019c90823bc412ceb90068ffbd'

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

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ff49f677 from the openjdk/jdk repository.

The commit being backported was authored by Severin Gehwolf on 5 Jul 2024 and was reviewed by George Adams and Thomas Stuefe.

Thanks!

@gnu-andrew
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk23

@openjdk
Copy link

@openjdk openjdk bot commented on ff49f67 Jul 5, 2024

Choose a reason for hiding this comment

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

@gnu-andrew The target repository jdk23 is not a valid target for backports.
List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk21u, openjdk/jdk21u-dev, openjdk/jdk22u, openjdk/jdk23u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/jfx, openjdk/jfx17u, openjdk/jfx21u, openjdk/jfx22u, openjdk/lilliput-jdk17u, openjdk/lilliput-jdk21u, openjdk/shenandoah-jdk21u, openjdk/shenandoah-jdk8u.
Supplying the organization/group prefix is optional.

@gnu-andrew
Copy link
Member

Choose a reason for hiding this comment

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

/backport jdk23u

@openjdk
Copy link

@openjdk openjdk bot commented on ff49f67 Jul 5, 2024

Choose a reason for hiding this comment

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

@gnu-andrew the backport was successfully created on the branch backport-gnu-andrew-ff49f677-master in my personal fork of openjdk/jdk23u. To create a pull request with this backport targeting openjdk/jdk23u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ff49f677 from the openjdk/jdk repository.

The commit being backported was authored by Severin Gehwolf on 5 Jul 2024 and was reviewed by George Adams and Thomas Stuefe.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk23u:

$ git fetch https://github.com/openjdk-bots/jdk23u.git backport-gnu-andrew-ff49f677-master:backport-gnu-andrew-ff49f677-master
$ git checkout backport-gnu-andrew-ff49f677-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk23u.git backport-gnu-andrew-ff49f677-master

⚠️ @gnu-andrew You are not yet a collaborator in my fork openjdk-bots/jdk23u. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.