Skip to content

Update SECURITY.md (backport #1626)#1634

Merged
thanethomson merged 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-1626
Nov 16, 2023
Merged

Update SECURITY.md (backport #1626)#1634
thanethomson merged 3 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-1626

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 16, 2023

This is an automatic backport of pull request #1626 done by Mergify.
Cherry-pick of 62a97f2 has failed:

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

You are currently cherry-picking commit 62a97f2c9.
  (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:   SECURITY.md

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

Signed-off-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 62a97f2)

# Conflicts:
#	SECURITY.md
@mergify mergify bot requested a review from a team as a code owner November 16, 2023 10:52
@mergify mergify bot added the conflicts label Nov 16, 2023
@thanethomson thanethomson merged commit 4c6e83d into v0.37.x Nov 16, 2023
@thanethomson thanethomson deleted the mergify/bp/v0.37.x/pr-1626 branch November 16, 2023 11:25
g3ndo9kar9 pushed a commit to skip-mev/cometbft that referenced this pull request Jan 16, 2024
* Update SECURITY.md (cometbft#1626)

Signed-off-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 62a97f2)

# Conflicts:
#	SECURITY.md

* Resolve conflicts

Signed-off-by: Thane Thomson <connect@thanethomson.com>

---------

Signed-off-by: Thane Thomson <connect@thanethomson.com>
Co-authored-by: Thane Thomson <connect@thanethomson.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant