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

fix(xds): backwards compatibility on access logs paths (backport of #7662) #7690

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Sep 7, 2023

Automatic cherry-pick of #7662 for branch release-2.0

Generated by action

cherry-picked commit 27ea0f0
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.0
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 27ea0f00c.
  (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:   pkg/core/xds/metadata.go
	both modified:   pkg/core/xds/metadata_test.go
	both modified:   pkg/xds/auth/callbacks.go
	both modified:   pkg/xds/server/callbacks/dataplane_callbacks.go
	both modified:   pkg/xds/server/callbacks/dataplane_status_tracker.go

no changes added to commit (use "git add" and/or "git commit -a")

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@lahabana lahabana deleted the chore/backport-release-2.0-7662 branch October 11, 2023 10:03
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.

1 participant