Skip to content
This repository has been archived by the owner on Oct 25, 2023. It is now read-only.

Main #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion 01 Introduction to CloudFormation/SimpleExample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ Resources:
ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia
Tags:
- Key: Name
Value: A simple example
Value: !Join [ " ", [ I, love, big, Drape ] ]
#### this is a test of the CF automation
7 changes: 7 additions & 0 deletions 01 Introduction to CloudFormation/SimpleExampleNoTags.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,10 @@ Resources:
Properties:
InstanceType: t2.micro
ImageId: ami-467ca739 # Amazon Linux AMI in N.Virginia
<<<<<<< Updated upstream
=======
Tags:
- key: Name
Value: A simple example
### Quick update to test automation
>>>>>>> Stashed changes