Skip to content

Conversation

@github-actions
Copy link
Contributor

Backport

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

🚨

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:
@rkoron007
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/terraform/merges: 409 Merge conflict []

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


Small PR to add the provider to the example in terraform.applying and make it explicit what is going on in the code example.

CHANGELOG entry

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

Overview of commits

@hashicorp-cla-app
Copy link

hashicorp-cla-app bot commented Apr 30, 2025

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


1 out of 2 committers have signed the CLA.

  • rkoron007
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already 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.

@rkoron007 rkoron007 marked this pull request as ready for review April 30, 2025 22:14
@rkoron007 rkoron007 requested review from a team as code owners April 30, 2025 22:14
@rkoron007 rkoron007 requested a review from LeahMarieBush April 30, 2025 22:14
Copy link
Contributor

@rkoron007 rkoron007 left a comment

Choose a reason for hiding this comment

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

Looks good!

@rkoron007 rkoron007 enabled auto-merge (squash) April 30, 2025 22:14
@rkoron007 rkoron007 added the no-changelog-needed Add this to your PR if the change does not require a changelog entry label Apr 30, 2025
@rkoron007 rkoron007 merged commit f91289f into v1.10 May 1, 2025
9 of 10 checks passed
@rkoron007 rkoron007 deleted the backport/RK/terraform-applying-example/illegally-moving-kiwi branch May 1, 2025 02:54
@github-actions
Copy link
Contributor Author

github-actions bot commented Jun 1, 2025

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 1, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

no-changelog-needed Add this to your PR if the change does not require a changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants