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

generate_pull_response optimization (bp #11597) #11954

Merged
merged 2 commits into from
Sep 1, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 31, 2020

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

Cherry-pick of f519fde has failed:

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

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

Changes to be committed:

	modified:   core/src/crds.rs

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

	both modified:   core/src/crds_gossip_pull.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/

(cherry picked from commit f519fde)

# Conflicts:
#	core/src/crds_gossip_pull.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 31, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 31, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 31, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 31, 2020
@carllin carllin removed the conflicts label Aug 31, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 31, 2020

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 Aug 31, 2020
@codecov
Copy link

codecov bot commented Sep 1, 2020

Codecov Report

Merging #11954 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 89.6%.

@@           Coverage Diff            @@
##            v1.2   #11954     +/-   ##
========================================
- Coverage   82.0%    82.0%   -0.1%     
========================================
  Files        321      321             
  Lines      77033    77054     +21     
========================================
+ Hits       63203    63218     +15     
- Misses     13830    13836      +6     

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants