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

Unsafe int cast in kill command (backport #783) #793

Merged
merged 3 commits into from
May 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 4, 2023

This is an automatic backport of pull request #783 done by Mergify.
Cherry-pick of 03c5e77 has failed:

On branch mergify/bp/v0.37.x/pr-783
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 03c5e7727.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmd/cometbft/commands/debug/kill.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Unsafe int cast in `kill` command

* Revert "Unsafe int cast in `kill` command"

This reverts commit bbd649b.

* Changed strategy

(cherry picked from commit 03c5e77)

# Conflicts:
#	cmd/cometbft/commands/debug/kill.go
@mergify mergify bot added the conflicts label May 4, 2023
@mergify mergify bot requested a review from a team as a code owner May 4, 2023 17:30
* Unsafe int cast in `kill` command

* Revert "Unsafe int cast in `kill` command"

This reverts commit bbd649b.

* Changed strategy
@sergio-mena sergio-mena self-assigned this May 4, 2023
@sergio-mena sergio-mena added the bug Something isn't working label May 4, 2023
@sergio-mena sergio-mena merged commit 72fa535 into v0.37.x May 4, 2023
18 checks passed
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-783 branch May 4, 2023 17:59
DongLieu pushed a commit to DongCoNY/cometbft that referenced this pull request May 13, 2024
* Unsafe int cast in `kill` command (cometbft#783)

* Unsafe int cast in `kill` command

* Revert "Unsafe int cast in `kill` command"

This reverts commit bbd649b.

* Changed strategy

(cherry picked from commit 03c5e77)

# Conflicts:
#	cmd/cometbft/commands/debug/kill.go

* Revert "Unsafe int cast in `kill` command (cometbft#783)"

This reverts commit 5cf3226.

* Unsafe int cast in `kill` command (cometbft#783)

* Unsafe int cast in `kill` command

* Revert "Unsafe int cast in `kill` command"

This reverts commit bbd649b.

* Changed strategy

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

1 participant