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

chore: clarify negative time elapsed error (backport #1012) #1013

Merged
merged 3 commits into from
Jun 8, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2022

This is an automatic backport of pull request #1012 done by Mergify.
Cherry-pick of 650016f has failed:

On branch mergify/bp/release/v2.x.x/pr-1012
Your branch is up to date with 'origin/release/v2.x.x'.

You are currently cherry-picking commit 650016f.
  (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:   x/leverage/keeper/interest.go

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

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

* chore: clarify negative time elapsed error

* cl++

(cherry picked from commit 650016f)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested review from a team as code owners June 8, 2022 15:38
@mergify mergify bot added the conflicts label Jun 8, 2022
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Jun 8, 2022

Codecov Report

Merging #1013 (8fe29b9) into release/v2.x.x (08d32b5) will decrease coverage by 0.00%.
The diff coverage is 33.33%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           release/v2.x.x    #1013      +/-   ##
==================================================
- Coverage           50.76%   50.75%   -0.01%     
==================================================
  Files                  64       64              
  Lines                9483     9482       -1     
==================================================
- Hits                 4814     4813       -1     
  Misses               4424     4424              
  Partials              245      245              
Impacted Files Coverage Δ
x/leverage/keeper/interest.go 82.35% <33.33%> (-0.13%) ⬇️

@toteki toteki merged commit 49247bb into release/v2.x.x Jun 8, 2022
@toteki toteki deleted the mergify/bp/release/v2.x.x/pr-1012 branch June 8, 2022 16:25
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