Skip to content

Backport of Fix Docs for Trails Leader By into release/1.15.x#17803

Merged
asheshvidyut merged 9 commits intorelease/1.15.xfrom
backport/asheshvidyut/NET-3865/implicitly-splendid-alpaca
Jun 21, 2023
Merged

Backport of Fix Docs for Trails Leader By into release/1.15.x#17803
asheshvidyut merged 9 commits intorelease/1.15.xfrom
backport/asheshvidyut/NET-3865/implicitly-splendid-alpaca

Conversation

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

Backport

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

🚨

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: unable to process merge commit: "13903531eacb25fca9a599a0cdd4f70d47e5f006", automatic backport requires rebase workflow

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


Fix docs mentioned in #17751 (comment)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/asheshvidyut/NET-3865/implicitly-splendid-alpaca branch from 8b99c7f to e68daf7 Compare June 17, 2023 02:13
@github-actions github-actions bot added theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified labels Jun 17, 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-ui-staging June 17, 2023 02:21 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 17, 2023 02:21 Inactive
asheshvidyut and others added 5 commits June 21, 2023 11:53
…ca' of ssh://github.com/hashicorp/consul into backport/asheshvidyut/NET-3865/implicitly-splendid-alpaca
* init

* fix tests

* added -detailed in docs

* added change log

* fix doc

* checking for entry in map

* fix tests

* removed detailed flag

* removed detailed flag

* revert unwanted changes

* removed unwanted changes

* updated change log

* pr review comment changes

* pr comment changes single API instead of two

* fix change log

* fix tests

* fix tests

* fix test operator raft endpoint test

* Update .changelog/17582.txt

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>

* nits

* updated docs

* explanation added

* fix doc

* fix docs

---------

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
@asheshvidyut asheshvidyut marked this pull request as ready for review June 21, 2023 06:27
@asheshvidyut asheshvidyut requested a review from a team as a code owner June 21, 2023 06:27
@asheshvidyut asheshvidyut merged commit a04cbd6 into release/1.15.x Jun 21, 2023
@asheshvidyut asheshvidyut deleted the backport/asheshvidyut/NET-3865/implicitly-splendid-alpaca branch June 21, 2023 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants