Skip to content

Backport of Fix docs for log file name changes into release/1.16.x#18977

Merged
asheshvidyut merged 2 commits intorelease/1.16.xfrom
backport/doc-update-for-log-file-changes/locally-poetic-mole
Sep 22, 2023
Merged

Backport of Fix docs for log file name changes into release/1.16.x#18977
asheshvidyut merged 2 commits intorelease/1.16.xfrom
backport/doc-update-for-log-file-changes/locally-poetic-mole

Conversation

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

Backport

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

🚨

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

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/doc-update-for-log-file-changes/locally-poetic-mole branch from ba0e176 to 18a67d7 Compare September 22, 2023 13:53
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/doc-update-for-log-file-changes/locally-poetic-mole branch from 18a67d7 to ba0e176 Compare September 22, 2023 13:53
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Sep 22, 2023
Copy link
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

@vercel vercel bot temporarily deployed to Preview – consul September 22, 2023 14:06 Inactive
* fix docs

* Update website/content/docs/agent/config/cli-flags.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>

* Update website/content/docs/agent/config/cli-flags.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>

* Update website/content/docs/agent/config/cli-flags.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>

---------

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
@asheshvidyut asheshvidyut marked this pull request as ready for review September 22, 2023 14:08
@asheshvidyut asheshvidyut requested a review from a team as a code owner September 22, 2023 14:08
@asheshvidyut asheshvidyut enabled auto-merge (squash) September 22, 2023 14:08
@asheshvidyut asheshvidyut merged commit a6a8312 into release/1.16.x Sep 22, 2023
@asheshvidyut asheshvidyut deleted the backport/doc-update-for-log-file-changes/locally-poetic-mole branch September 22, 2023 14:12
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