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

Abort if the open fd limit cannot be increased (bp #10064) #10074

Merged
merged 2 commits into from
May 15, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 15, 2020

This is an automated backport of pull request #10064 done by Mergify

Cherry-pick of 7080fb9 has failed:

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

You are currently cherry-picking commit 7080fb9b3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   ledger/src/blockstore.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   ledger/src/blockstore_db.rs

To fixup this pull request, you can check out it 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 simulator.

Finally, you can contact us on https://mergify.io/

automerge

(cherry picked from commit 7080fb9)

# Conflicts:
#	ledger/src/blockstore_db.rs
@mergify mergify bot added the conflicts label May 15, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 15, 2020
@solana-grimes solana-grimes merged commit 7bc915c into v1.1 May 15, 2020
@mergify mergify bot deleted the mergify/bp/v1.1/pr-10064 branch May 15, 2020 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants