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

v1.16: Adds default info to cli arg for --accounts-hash-cache-path (backport of #33331) #33336

Merged
merged 2 commits into from
Sep 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 21, 2023

This is an automatic backport of pull request #33331 done by Mergify.
Cherry-pick of 1d39c31 has failed:

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

You are currently cherry-picking commit 1d39c3167d.
  (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:   validator/src/cli.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger-tool/src/main.rs

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

@brooksprumo
Copy link
Contributor

brooksprumo commented Sep 21, 2023

Blocked until quinn is updated (#33350)

Edit: Done

@brooksprumo
Copy link
Contributor

brooksprumo commented Sep 21, 2023

@willhickey Tagging you for review and as an FYI. Once the quinn PR is merged, I'll rebase this one.

@brooksprumo brooksprumo force-pushed the mergify/bp/v1.16/pr-33331 branch from cbdf6f3 to 300e2b6 Compare September 21, 2023 17:08
@brooksprumo
Copy link
Contributor

@willhickey Ok, this is ready for review now. Thanks!

Copy link
Contributor

@willhickey willhickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved for v1.16

@willhickey willhickey merged commit c932953 into v1.16 Sep 21, 2023
17 checks passed
@willhickey willhickey deleted the mergify/bp/v1.16/pr-33331 branch September 21, 2023 19:36
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