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

chore: upgrade sdk with snapshot manager fix (backport #1700) #1706

Merged
merged 2 commits into from
Jun 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2022

This is an automatic backport of pull request #1700 done by Mergify.
Cherry-pick of 9165ac2 has failed:

On branch mergify/bp/v9.x/pr-1700
Your branch is up to date with 'origin/v9.x'.

You are currently cherry-picking commit 9165ac2.
  (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:   go.mod
	modified:   go.sum
	modified:   tests/e2e/chain/config.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* chore: upgrade sdk with snapshot manager fix

* changelog

* Update branch version

* Try fix e2e test

Co-authored-by: Dev Ojha <[email protected]>
Co-authored-by: Dev Ojha <[email protected]>
(cherry picked from commit 9165ac2)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team June 7, 2022 23:22
@mergify mergify bot added the conflicts label Jun 7, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
@czarcas7ic czarcas7ic merged commit c3263d8 into v9.x Jun 7, 2022
@czarcas7ic czarcas7ic deleted the mergify/bp/v9.x/pr-1700 branch June 7, 2022 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants