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

Don't share same snapshot dir for secondary access (bp #10384)#10386

Merged
solana-grimes merged 3 commits into
v1.1from
mergify/bp/v1.1/pr-10384
Jun 3, 2020
Merged

Don't share same snapshot dir for secondary access (bp #10384)#10386
solana-grimes merged 3 commits into
v1.1from
mergify/bp/v1.1/pr-10384

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 3, 2020

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

Cherry-pick of b515cc3 has failed:

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

You are currently cherry-picking commit b515cc3ae.
  (fix conflicts and run "git cherry-pick --continue")
  (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 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 b515cc3)

# Conflicts:
#	ledger-tool/src/main.rs
@mergify mergify Bot added the conflicts label Jun 3, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 3, 2020

Codecov Report

Merging #10386 into v1.1 will increase coverage by 0.0%.
The diff coverage is n/a.

@@          Coverage Diff           @@
##            v1.1   #10386   +/-   ##
======================================
  Coverage   80.7%    80.7%           
======================================
  Files        289      289           
  Lines      66926    66926           
======================================
+ Hits       54058    54060    +2     
+ Misses     12868    12866    -2     

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2020
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2020
@ryoqun ryoqun added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Jun 3, 2020
@solana-grimes solana-grimes merged commit dca932f into v1.1 Jun 3, 2020
@mergify mergify Bot deleted the mergify/bp/v1.1/pr-10384 branch June 3, 2020 13:34
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants