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

fix: Several issues from dydx loadtest integ. [BLO-909] (backport #109) #110

Merged
merged 5 commits into from
Nov 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 21, 2024

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

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/types/chain.go

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 08711a7 has failed:

On branch mergify/bp/release/v1.x.x/pr-109
Your branch is ahead of 'origin/release/v1.x.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 08711a7.
  (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:   core/provider/docker/docker_provider.go
	modified:   core/provider/docker/task.go
	modified:   cosmos/chain/chain.go
	modified:   cosmos/loadtest/client_factory.go
	new file:   go.work
	new file:   go.work.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/types/chain.go
	both modified:   cosmos/cosmosutil/wallet.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 c2400e5)

# Conflicts:
#	core/types/chain.go
(cherry picked from commit 08711a7)

# Conflicts:
#	core/types/chain.go
#	cosmos/cosmosutil/wallet.go
(cherry picked from commit 76d4b88)
@Zygimantass Zygimantass merged commit ca17a67 into release/v1.x.x Nov 5, 2024
1 of 3 checks passed
@Zygimantass Zygimantass deleted the mergify/bp/release/v1.x.x/pr-109 branch November 5, 2024 14:05
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