Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 27, 2021

This is an automatic backport of pull request #3756 done by Mergify.
Cherry-pick of 0be61da has failed:

On branch mergify/bp/release-v0.9/pr-3756
Your branch is up to date with 'origin/release-v0.9'.

You are currently cherry-picking commit 0be61daa.
  (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:
	deleted:    tests/e2e/constants.go
	modified:   tests/e2e/e2e_deployment_client_server_test.go
	modified:   tests/e2e/e2e_metrics_test.go
	modified:   tests/e2e/e2e_trafficsplit_recursive_split.go
	modified:   tests/e2e/e2e_trafficsplit_same_sa_test.go
	modified:   tests/e2e/e2e_trafficsplit_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/framework/common.go

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.io/

Signed-off-by: Sanya Kochhar <[email protected]>
(cherry picked from commit 0be61da)

# Conflicts:
#	tests/framework/common.go
@mergify mergify bot requested a review from a team as a code owner July 27, 2021 21:06
@mergify mergify bot added the conflicts label Jul 27, 2021
nshankar13 and others added 2 commits July 27, 2021 17:41
Signed-off-by: nshankar13 <[email protected]>
Signed-off-by: nshankar13 <[email protected]>
@nshankar13 nshankar13 force-pushed the mergify/bp/release-v0.9/pr-3756 branch from 602150c to 5465e2b Compare July 27, 2021 21:51
@codecov-commenter
Copy link

codecov-commenter commented Jul 27, 2021

Codecov Report

Merging #3873 (5465e2b) into release-v0.9 (e20efa2) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff                @@
##           release-v0.9    #3873      +/-   ##
================================================
+ Coverage         66.94%   66.95%   +0.01%     
================================================
  Files               169      169              
  Lines              9149     9149              
================================================
+ Hits               6125     6126       +1     
+ Misses             2991     2990       -1     
  Partials             33       33              
Flag Coverage Δ
unittests 66.95% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/endpoint/providers/kube/client.go 82.78% <0.00%> (+0.81%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e20efa2...5465e2b. Read the comment docs.

@nshankar13 nshankar13 merged commit 84f8144 into release-v0.9 Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/release-v0.9/pr-3756 branch July 28, 2021 14:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants