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

light: handle too high errors correctly (backport #6346) #6351

Merged
merged 2 commits into from
Apr 13, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 13, 2021

This is an automatic backport of pull request #6346 done by Mergify.

Cherry-pick of d4d2b66 has failed:

On branch mergify/bp/v0.34.x/pr-6346
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit d4d2b6606.
  (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:   CHANGELOG_PENDING.md
	both modified:   light/client.go

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 config editor.

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

(cherry picked from commit d4d2b66)

# Conflicts:
#	CHANGELOG_PENDING.md
#	light/client.go
@codecov
Copy link

codecov bot commented Apr 13, 2021

Codecov Report

❗ No coverage uploaded for pull request base (v0.34.x@a9ac635). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             v0.34.x    #6351   +/-   ##
==========================================
  Coverage           ?   60.41%           
==========================================
  Files              ?      265           
  Lines              ?    24298           
  Branches           ?        0           
==========================================
  Hits               ?    14680           
  Misses             ?     8085           
  Partials           ?     1533           

Copy link
Contributor

@cmwaters cmwaters left a comment

Choose a reason for hiding this comment

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

Good work @cmwaters

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.

None yet

1 participant