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.

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

Backport of Generate helm docs for release consul-k8s 1.1.2 into release/1.15.x #17573

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #17568 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:
@curtbushko
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

Generate docs for consul-k8s 1.1.2 release.

  • In the case of bugs, describe how to replicate
  • If any manual tests were done, document the steps and the conditions to replicate
  • Call out any important/ relevant unit tests, e2e tests or integration tests you have added or are adding

-->

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/consul-k8s-release-1.1.2-helm-docs/adversely-sweet-sculpin branch 2 times, most recently from 576e751 to db58469 Compare June 5, 2023 20:05
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 5, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


2 out of 3 committers have signed the CLA.

  • curtbushko
  • jmurret
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link

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 5, 2023 20:09 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 5, 2023 20:09 Inactive
@curtbushko curtbushko marked this pull request as ready for review June 5, 2023 20:15
@curtbushko curtbushko requested a review from a team as a code owner June 5, 2023 20:15
@curtbushko
Copy link
Contributor

Forcing this merge because we are getting blocked by the CLA temp user bug.

@curtbushko curtbushko merged commit 27332fc into release/1.15.x Jun 22, 2023
@curtbushko curtbushko deleted the backport/consul-k8s-release-1.1.2-helm-docs/adversely-sweet-sculpin branch June 22, 2023 18:47
@jira jira bot mentioned this pull request Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants