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: improved schema for finalized bundles query (backport #104) #105

Merged
merged 2 commits into from
Jul 11, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 10, 2023

This is an automatic backport of pull request #104 done by Mergify.
Cherry-pick of cf4857f has failed:

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

You are currently cherry-picking commit cf4857f.
  (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:   docs/swagger.yml
	modified:   proto/kyve/query/v1beta1/bundles.proto
	modified:   testutil/integration/checks.go
	modified:   x/bundles/keeper/getters_bundles.go
	modified:   x/bundles/types/types.go
	modified:   x/query/client/cli/query_finalized_bundles.go
	deleted:    x/query/keeper/grpc_query_finalized_bundle.go
	new file:   x/query/keeper/grpc_query_finalized_bundles.go
	new file:   x/query/spec/01_concept.md
	modified:   x/query/types/bundles.pb.go
	modified:   x/query/types/bundles.pb.gw.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   app/upgrades/v1_3/upgrade.go
	both modified:   proto/kyve/bundles/v1beta1/bundles.proto
	both modified:   x/bundles/types/bundles.pb.go
	both modified:   x/bundles/types/keys.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 cf4857f)

# Conflicts:
#	CHANGELOG.md
#	app/upgrades/v1_3/upgrade.go
#	proto/kyve/bundles/v1beta1/bundles.proto
#	x/bundles/types/bundles.pb.go
#	x/bundles/types/keys.go
@mbreithecker mbreithecker merged commit 5e8866f into release/v1.2.x Jul 11, 2023
2 checks passed
@mbreithecker mbreithecker deleted the mergify/bp/release/v1.2.x/pr-104 branch July 11, 2023 09:52
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