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(deps): fix bad merge with ginkgo v1/v2 #3945

Merged
merged 1 commit into from
Feb 28, 2022

Conversation

michaelbeaumont
Copy link
Contributor

Summary

See #3910

@michaelbeaumont michaelbeaumont requested a review from a team as a code owner February 28, 2022 11:01
@jakubdyszkiewicz
Copy link
Contributor

uhh, thanks for the fix

@codecov-commenter
Copy link

Codecov Report

Merging #3945 (3935d22) into master (511d19f) will decrease coverage by 0.13%.
The diff coverage is 25.12%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3945      +/-   ##
==========================================
- Coverage   55.98%   55.85%   -0.14%     
==========================================
  Files         911      916       +5     
  Lines       54267    54526     +259     
==========================================
+ Hits        30381    30454      +73     
- Misses      21442    21631     +189     
+ Partials     2444     2441       -3     
Impacted Files Coverage Δ
pkg/core/permissions/matcher.go 92.59% <ø> (ø)
test/framework/config.go 26.00% <ø> (ø)
...framework/deployments/externalservice/universal.go 3.79% <0.00%> (ø)
test/framework/envoy_admin/stats/stats.go 0.00% <0.00%> (ø)
test/framework/envoy_admin/tunnel/k8s.go 0.00% <0.00%> (ø)
test/framework/envoy_admin/tunnel/universal.go 0.00% <0.00%> (ø)
test/framework/interface.go 0.00% <0.00%> (ø)
test/framework/k8s_cluster.go 0.00% <0.00%> (ø)
test/framework/k8s_clusters.go 0.00% <0.00%> (ø)
test/framework/ssh/ssh.go 0.00% <0.00%> (ø)
... and 26 more

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 32daa0a...3935d22. Read the comment docs.

@michaelbeaumont michaelbeaumont enabled auto-merge (squash) February 28, 2022 11:25
@michaelbeaumont michaelbeaumont changed the title chore: fix bad merge with ginkgo v1/v2 chore(deps): fix bad merge with ginkgo v1/v2 Feb 28, 2022
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont merged commit e1a88c3 into kumahq:master Feb 28, 2022
@michaelbeaumont michaelbeaumont deleted the chore/ginkgo_fix branch February 28, 2022 12:24
SallyBlichWalkMe pushed a commit to SallyBlichWalkMe/kuma that referenced this pull request Apr 14, 2022
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Sally Blich <sally.blich@walkme.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants