Skip to content

release v0.38.13 (fixed changelog) (backport #4333)#4335

Merged
mergify[bot] merged 2 commits intov0.38.x-experimentalfrom
mergify/bp/v0.38.x-experimental/pr-4333
Oct 25, 2024
Merged

release v0.38.13 (fixed changelog) (backport #4333)#4335
mergify[bot] merged 2 commits intov0.38.x-experimentalfrom
mergify/bp/v0.38.x-experimental/pr-4333

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 25, 2024

CHANGELOG

PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

This is an automatic backport of pull request #4333 done by [Mergify](https://mergify.com).

[CHANGELOG](https://github.com/cometbft/cometbft/blob/release/v0.38.13/CHANGELOG.md)

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

(cherry picked from commit 5544864)

# Conflicts:
#	.changelog/v0.38.13/bug-fixes/4295-copy-value-state-indexer.md
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner October 25, 2024 02:52
@mergify mergify bot added the conflicts label Oct 25, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 25, 2024

Cherry-pick of 5544864 has failed:

On branch mergify/bp/v0.38.x-experimental/pr-4333
Your branch is up to date with 'origin/v0.38.x-experimental'.

You are currently cherry-picking commit 554486455.
  (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)

Changes to be committed:
	modified:   .changelog/unreleased/dependencies/4059-update-cometbft-db.md
	modified:   .changelog/v0.38.1/improvements/1558-experimental-gossip-limiting.md
	renamed:    .changelog/v0.38.3/bug-fixes/4019-mempool-metric-rejected-txs.md -> .changelog/v0.38.13/bug-fixes/4019-mempool-metric-rejected-txs.md
	renamed:    .changelog/v0.38.8/improvements/4019-mempool-metric-evicted-txs.md -> .changelog/v0.38.13/improvements/4019-mempool-metric-evicted-txs.md
	new file:   .changelog/v0.38.13/improvements/4123-mempool-is-full-log.md
	deleted:    .changelog/v0.38.8/improvements/4123-mempool-is-full-log.md

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .changelog/v0.38.13/bug-fixes/4295-copy-value-state-indexer.md
	both modified:   CHANGELOG.md

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

@melekes melekes removed the conflicts label Oct 25, 2024
@mergify mergify bot merged commit 2b9c768 into v0.38.x-experimental Oct 25, 2024
@mergify mergify bot deleted the mergify/bp/v0.38.x-experimental/pr-4333 branch October 25, 2024 04:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants