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

Fix merge conflict issue #761

Merged
merged 1 commit into from
Aug 13, 2024
Merged

Fix merge conflict issue #761

merged 1 commit into from
Aug 13, 2024

Conversation

james03160927
Copy link
Contributor

Description

Merge conflict issue introduced in https://github.com/gruntwork-io/cloud-nuke/pull/760/files#diff-373f5578b8f362a364b50b0d01919a57da64c128547ca10d49df8ae422237c82.

TODOs

Read the Gruntwork contribution guidelines.

  • Update the docs.
  • Run the relevant tests successfully, including pre-commit checks.
  • Ensure any 3rd party code adheres with our license policy or delete this line if its not applicable.
  • Include release notes. If this PR is backward incompatible, include a migration guide.
  • Attention Grunts - if this PR adds support for a new resource, ensure the nuke_sandbox and nuke_phxdevops jobs in .circleci/config.yml have been updated with appropriate exclusions (either directly in the job or via the .circleci/nuke_config.yml file) to prevent nuking IAM roles, groups, resources, etc that are important for the test accounts.

Release Notes (draft)

Added / Removed / Updated [X].

Migration Guide

autero1
autero1 approved these changes Aug 13, 2024
View reviewed changes
Copy link
Contributor

@autero1 autero1 left a comment

Choose a reason for hiding this comment

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

LGTM

@james03160927 james03160927 merged commit c818032 into master Aug 13, 2024
3 checks passed
@james03160927 james03160927 deleted the merge_conflict branch August 13, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@autero1 autero1 autero1 approved these changes

@arsci arsci Awaiting requested review from arsci arsci is a code owner

@denis256 denis256 Awaiting requested review from denis256 denis256 is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@james03160927 @autero1