Backport of chore: apply enterprise changes that were missed to some testing files into release/1.17.x#19507
Merged
hc-github-team-consul-core merged 1 commit intorelease/1.17.xfrom Nov 3, 2023
Conversation
hc-github-team-consul-core
force-pushed
the
backport/rboyer/fix-drift/strongly-robust-shepherd
branch
from
63a5535 to
1079840
Compare
hc-github-team-consul-core
force-pushed
the
backport/rboyer/fix-drift/strongly-robust-shepherd
branch
from
38e0c7c to
feb6a16
Compare
github-team-consul-core-pr-approver
approved these changes
Nov 3, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
rboyer
force-pushed
the
backport/rboyer/fix-drift/strongly-robust-shepherd
branch
from
feb6a16 to
544b003
Compare
hc-github-team-consul-core
deleted the
backport/rboyer/fix-drift/strongly-robust-shepherd
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #19504 to be assessed for backporting due to the inclusion of the label backport/1.17.
The below text is copied from the body of the original PR.
Description
This should align between CE ef35525 and ENT 7f95226 in:
Overview of commits