Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

get_program_accounts_with_config() now correctly defaults to RpcClient's commitment level (backport #17312) #17315

Merged
merged 2 commits into from
May 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 18, 2021

This is an automatic backport of pull request #17312 done by Mergify.
Cherry-pick of 63b9772 has failed:

On branch mergify/bp/v1.6/pr-17312
Your branch is up to date with 'origin/v1.6'.

You are currently cherry-picking commit 63b97729e.
  (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:   client/src/rpc_client.rs

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

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

…t's commitment level

(cherry picked from commit 63b9772)

# Conflicts:
#	client/src/rpc_client.rs
@mergify mergify bot added the conflicts label May 18, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 18, 2021
@mergify mergify bot merged commit 11f6c04 into v1.6 May 18, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-17312 branch May 18, 2021 21:19
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant