chore(ci): fix merge fix #5387
Merged
chore(ci): fix merge fix #5387
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pdk27
requested review from
link108
and removed request for
ajordens,
jeyrschabu and
aravindmd
link108
approved these changes
Jun 14, 2021
mergify bot
added a commit
that referenced
this pull request
Jun 14, 2021
…tes (backport #5370) (#5372) * fix(6430): Adding missing block device mappings for new launch templates (#5370) spinnaker/spinnaker#6430 Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 07186a0) # Conflicts: # clouddriver-aws/src/main/groovy/com/netflix/spinnaker/clouddriver/aws/services/LaunchTemplateService.java * chore(ci): fix badly formatted merge * chore(ci): fix merge fix (#5387) Co-authored-by: Prathibha Datta Kumar <kprathib@amazon.com> Co-authored-by: Cameron Motevasselani <cameron@armory.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixing merge fix for #5372
1.25 backport release