Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: FIx merge conflict #17404

Merged
merged 4 commits into from
May 18, 2023
Merged

docs: FIx merge conflict #17404

merged 4 commits into from
May 18, 2023

Commits on May 12, 2023

  1. no-op commit due to failed cherry-picking

    temp committed May 12, 2023
    Configuration menu
    Copy the full SHA
    a414fd0 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. docs: connect-service-upstreams annotation fixes (#17312) 

    * corrections

* fixes

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: trujillo-adam <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Update website/content/docs/k8s/annotations-and-labels.mdx

Co-authored-by: Jared Kirschner <[email protected]>

* Switching order of labeled/unlabeled

---------

Co-authored-by: Jared Kirschner <[email protected]>
Co-authored-by: trujillo-adam <[email protected]>
    @boruszak @jkirschner-hashicorp @trujillo-adam
    3 people committed May 17, 2023
    Configuration menu
    Copy the full SHA
    1303db1 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. Git Head fixes

    @boruszak
    boruszak committed May 18, 2023
    Configuration menu
    Copy the full SHA
    2d5d5e7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/1.14.x' into backport/docs/annotations-page-str… 

    …ucture-fixes/shortly-accurate-boa
    @boruszak
    boruszak authored May 18, 2023
    Configuration menu
    Copy the full SHA
    58494f6 View commit details
    Browse the repository at this point in the history