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

Add option to reclaim accounts-cluster-bench accounts/lamports (backport #21656)#21658

Merged
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-21656
Dec 7, 2021
Merged

Add option to reclaim accounts-cluster-bench accounts/lamports (backport #21656)#21658
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-21656

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 7, 2021

This is an automatic backport of pull request #21656 done by Mergify.
Cherry-pick of 205fd95 has failed:

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

You are currently cherry-picking commit 205fd9572.
  (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:   Cargo.lock
	modified:   accounts-cluster-bench/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   accounts-cluster-bench/Cargo.toml

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

* Add option to reclaim accounts-cluster-bench accounts/lamports

* lint

(cherry picked from commit 205fd95)

# Conflicts:
#	accounts-cluster-bench/Cargo.toml
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 7, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 7, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 7, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 7, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 7, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 7, 2021

Codecov Report

Merging #21658 (286c862) into v1.9 (87accd1) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.9   #21658   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         511      511           
  Lines      143102   143102           
=======================================
+ Hits       116860   116872   +12     
+ Misses      26242    26230   -12     

@mergify mergify Bot merged commit 2b4347d into v1.9 Dec 7, 2021
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-21656 branch December 7, 2021 09:19
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
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