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

refactor: add logger (backport #735) #741

Merged
merged 4 commits into from
Apr 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2023

This is an automatic backport of pull request #735 done by Mergify.
Cherry-pick of 85a123c has failed:

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

You are currently cherry-picking commit 85a123c.
  (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.md
	modified:   basic_test.go
	modified:   benchmarks/bench_test.go
	modified:   benchmarks/cosmos-exim/main.go
	modified:   cmd/iaviewer/main.go
	modified:   diff_test.go
	modified:   immutable_tree.go
	modified:   import_test.go
	modified:   iterator_test.go
	modified:   mutable_tree.go
	modified:   mutable_tree_test.go
	modified:   nodedb.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/rm <file>..." as appropriate to mark resolution)
	both modified:   export_test.go
	both modified:   go.mod
	both modified:   go.sum
	deleted by them: internal/logger/logger.go

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

(cherry picked from commit 85a123c)

# Conflicts:
#	export_test.go
#	go.mod
#	go.sum
#	internal/logger/logger.go
@mergify mergify bot requested a review from a team as a code owner April 12, 2023 12:50
@mergify mergify bot added the conflicts label Apr 12, 2023
@mergify mergify bot mentioned this pull request Apr 12, 2023
@tac0turtle tac0turtle merged commit ff4d0f8 into release/v1.x.x Apr 13, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v1.x.x/pr-735 branch April 13, 2023 12:04
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