8000 `solana-ledger-tool graph` improvements (backport #26667) by mergify[bot] · Pull Request #26749 · solana-labs/solana · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

solana-ledger-tool graph improvements (backport #26667) #26749

Merged
merged 3 commits into from
Jul 23, 2022
Merged

solana-ledger-tool graph improvements (backport #26667) #26749

merged 3 commits into from
Jul 23, 2022

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jul 22, 2022

This is an automatic backport of pull request #26667 done by Mergify.
Cherry-pick of 633950e has failed:

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

You are currently cherry-picking commit 633950e02.
  (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:   ledger-tool/src/main.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://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

@mergify mergify bot added the conflicts label Jul 22, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 22, 2022
@mergify
Copy link
Contributor Author
mergify bot commented Jul 22, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 22, 2022
t-nelson added 2 commits July 22, 2022 17:48
@t-nelson
ledger-tool: factor out graph options to config struct
8be84d1 
(cherry picked from commit 633950e)

# Conflicts:
#	ledger-tool/src/main.rs
@t-nelson
ledger-tool: optionally graph vote states
53bc73d 
(cherry picked from commit 0fff5b8)
@t-nelson t-nelson force-pushed the mergify/bp/v1.10/pr-26667 branch from 1ca7d28 to 53bc73d Compare July 22, 2022 23:50
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 22, 2022
@mergify
Copy link
Contributor Author
mergify bot commented Jul 23, 2022

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 Jul 23, 2022
@mergify mergify bot merged commit 9cdd84b into v1.10 Jul 23, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-26667 branch July 23, 2022 04:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@t-nelson t-nelson

Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@t-nelson
0