Skip to content

Backport of Fix docs for log file name changes into release/1.14.x#18975

Merged
asheshvidyut merged 2 commits into
release/1.14.xfrom
backport/doc-update-for-log-file-changes/fully-saving-dane
Sep 22, 2023
Merged

Backport of Fix docs for log file name changes into release/1.14.x#18975
asheshvidyut merged 2 commits into
release/1.14.xfrom
backport/doc-update-for-log-file-changes/fully-saving-dane

Conversation

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

Backport

This PR is auto-generated from #18913 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:
@absolutelightning
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: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


Description

Fix docs for Log File name changes for PR - #15709


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 Sep 22, 2023
@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator Author

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@vercel vercel Bot temporarily deployed to Preview – consul September 22, 2023 13:59 Inactive
@asheshvidyut asheshvidyut marked this pull request as ready for review September 22, 2023 14:00
@asheshvidyut asheshvidyut requested a review from a team as a code owner September 22, 2023 14:00
@asheshvidyut asheshvidyut enabled auto-merge (squash) September 22, 2023 14:00
@asheshvidyut asheshvidyut merged commit 027a2a7 into release/1.14.x Sep 22, 2023
@asheshvidyut asheshvidyut deleted the backport/doc-update-for-log-file-changes/fully-saving-dane branch September 22, 2023 14:09
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.

3 participants