Skip to content

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

Merged
sergio-mena merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-783
May 4, 2023
Merged

Unsafe int cast in kill command (backport #783)#794
sergio-mena merged 3 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-783

Conversation

@mergify
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.34.x/pr-783
Your branch is up to date with 'origin/v0.34.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

@sergio-mena @mergify
Unsafe int cast in kill command (#783)
b7ab279 
* 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 requested a review from a team as a code owner May 4, 2023 17:30
@mergify mergify bot added the conflicts label May 4, 2023
sergio-mena added 2 commits May 4, 2023 19:37
@sergio-mena
Revert "Unsafe int cast in kill command (#783)"
f2b9447 
This reverts commit b7ab279.
@sergio-mena
Unsafe int cast in kill command (#783)
7efe753 
* 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 bug Something isn't working and removed conflicts labels May 4, 2023
@sergio-mena sergio-mena merged commit c5455d2 into v0.34.x May 4, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.34.x/pr-783 branch May 4, 2023 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@sergio-mena sergio-mena sergio-mena approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@sergio-mena sergio-mena

Labels

bug Something isn't working

Projects

No open projects
CometBFT 2023
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@sergio-mena