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

feat: decouple cosmos-db (backport #874) #887

Merged
merged 3 commits into from
Feb 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 20, 2024

This is an automatic backport of pull request #874 done by Mergify.
Cherry-pick of 11ba496 has failed:

On branch mergify/bp/release/v1.x.x/pr-874
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit 11ba496.
  (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:   Makefile
	modified:   basic_test.go
	modified:   batch_test.go
	modified:   benchmarks/bench_test.go
	modified:   benchmarks/cosmos-exim/main.go
	modified:   cmd/iaviewer/main.go
	new file:   db/memdb.go
	new file:   db/types.go
	new file:   db/wrapper.go
	modified:   diff_test.go
	modified:   export.go
	modified:   export_test.go
	modified:   go.mod
	modified:   immutable_tree.go
	modified:   import_test.go
	modified:   internal/bytes/bytes.go
	modified:   iterator_test.go
	modified:   migrate_test.go
	modified:   mock/db_mock.go
	modified:   mutable_tree.go
	modified:   mutable_tree_test.go
	modified:   nodedb_test.go
	modified:   proof_iavl_test.go
	modified:   proof_ics23_test.go
	modified:   testutils_test.go
	modified:   tree_random_test.go
	modified:   tree_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/lint.yml
	both modified:   batch.go
	both modified:   nodedb.go

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


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

(cherry picked from commit 11ba496)

# Conflicts:
#	.github/workflows/lint.yml
#	batch.go
#	nodedb.go
@mergify mergify bot requested a review from a team as a code owner February 20, 2024 17:11
@mergify mergify bot added the conflicts label Feb 20, 2024
@mergify mergify bot mentioned this pull request Feb 20, 2024
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

ACK (pending conflict resolution)

@alexanderbez alexanderbez merged commit e019f74 into release/v1.x.x Feb 21, 2024
5 checks passed
@alexanderbez alexanderbez deleted the mergify/bp/release/v1.x.x/pr-874 branch February 21, 2024 17:19
tac0turtle added a commit that referenced this pull request Mar 6, 2024
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.

2 participants