Skip to content

Backport of Fixes a couple of DNS token example commands into release/1.20.x#22244

Merged
boruszak merged 2 commits into
release/1.20.xfrom
backport/main/carefully-evident-ant
Mar 27, 2025
Merged

Backport of Fixes a couple of DNS token example commands into release/1.20.x#22244
boruszak merged 2 commits into
release/1.20.xfrom
backport/main/carefully-evident-ant

Conversation

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

Backport

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

🚨

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:
@boruszak
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: "ad800998c71a0b269feb28c5dd1e9516d8e72458", automatic backport requires rebase workflow

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


The -name option is not available -description is used in it's place.

set-agent-token is a sub-command of the acl command.

Description

A couple of updates to the documentation.


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 Mar 26, 2025
Copy link
Copy Markdown
Contributor

@nickwales nickwales left a comment

Choose a reason for hiding this comment

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

lgtm?

@boruszak boruszak marked this pull request as ready for review March 27, 2025 18:34
@boruszak boruszak requested a review from a team as a code owner March 27, 2025 18:34
@boruszak boruszak enabled auto-merge (squash) March 27, 2025 18:34
@boruszak boruszak merged commit 365c856 into release/1.20.x Mar 27, 2025
@boruszak boruszak deleted the backport/main/carefully-evident-ant branch March 27, 2025 18:35
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