Skip to content

Backport of Update docs into release/1.14.x#17897

Merged
trujillo-adam merged 1 commit into
release/1.14.xfrom
backport/patch-2/formally-golden-asp
Jun 27, 2023
Merged

Backport of Update docs into release/1.14.x#17897
trujillo-adam merged 1 commit into
release/1.14.xfrom
backport/patch-2/formally-golden-asp

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #17476 to be assessed for backporting due to the inclusion of the label backport/1.14.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@trujillo-adam
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "a6520c4656c1f47b63dff542e90db4df181275c5", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Description

Documentation had different/missing protocol field for each of the three examples


Overview of commits

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@github-actions github-actions Bot added the type/docs Documentation needs to be created/updated/clarified label Jun 27, 2023
@vercel vercel Bot temporarily deployed to Preview – consul-ui-staging June 27, 2023 16:21 Inactive
@vercel vercel Bot temporarily deployed to Preview – consul June 27, 2023 16:26 Inactive
@trujillo-adam trujillo-adam marked this pull request as ready for review June 27, 2023 16:36
@trujillo-adam trujillo-adam requested a review from a team as a code owner June 27, 2023 16:36
@trujillo-adam trujillo-adam merged commit 68ed247 into release/1.14.x Jun 27, 2023
@trujillo-adam trujillo-adam deleted the backport/patch-2/formally-golden-asp branch June 27, 2023 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants