Merge pull request #1 from ruecarlo/master

Changing Workshop order
awslabs · Mar 26, 2019 · 7eeb740 · 7eeb740
2 parents bfae252 + 644ad40
commit 7eeb740
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -2,11 +2,8 @@
 
 Collection of workshops to demonstrate best practices in using Amazon EC2 Spot Instances. https://aws.amazon.com/ec2/spot/
 
-<<<<<<< HEAD
-=======
 Website for this workshops is available at https://ec2spotworkshops.com
 
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 ## Building the Workshop site
 
 The content of the workshops is built using [hugo](https://gohugo.io/). 

diff --git a/config.toml b/config.toml
@@ -5,6 +5,7 @@ theme = "learn"
 uglyurls = true
 sectionPagesMenu = "main"
 pygmentsCodeFences = true
+googleAnalytics = "UA-136840914-1"
 
 
 [blackfriday]
@@ -31,7 +32,7 @@ page = [ "HTML", "AMP"]
   [privacy.googleAnalytics]
     anonymizeIP = false
     disable = false
-    respectDoNotTrack = false
+    respectDoNotTrack = true
     useSessionStorage = false
   [privacy.instagram]
     disable = false

diff --git a/content/authors.md b/content/authors.md
@@ -9,9 +9,5 @@ disableToc: true
 
 {{% contributors "https://api.github.com/repos/aws-samples/ecs-deep-learning-workshop/contributors?per_page=1000" "true" "hyandell" %}}
 {{% contributors "https://api.github.com/repos/awslabs/ec2-spot-workshops/contributors?per_page=1000" "true" "schmutze"%}}
-<<<<<<< HEAD
-{{% contributors "/static/data/contributors.json" "false" %}}
-=======
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 
 
diff --git a/content/launching_ec2_spot_instances/_index.md b/content/launching_ec2_spot_instances/_index.md
@@ -1,11 +1,7 @@
 ---
 title: "Launching EC2 Spot Instances"
 date: 2019-01-31T08:51:33Z
-<<<<<<< HEAD
 weight: 20
-=======
-weight: 10
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 pre: "<b>⁃ </b>"
 ---
 

diff --git a/content/running-amazon-ec2-workloads-at-scale/_index.md b/content/running-amazon-ec2-workloads-at-scale/_index.md
@@ -1,11 +1,7 @@
 ---
 title: "Running EC2 Workloads at Scale with EC2 Auto Scaling"
 date: 2019-01-24T09:05:54Z
-<<<<<<< HEAD
 weight: 10
-=======
-weight: 20
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 pre: "<b>⁃ </b>"
 ---
 

diff --git a/content/running-amazon-ec2-workloads-at-scale/deploy_app_codedeploy.md b/content/running-amazon-ec2-workloads-at-scale/deploy_app_codedeploy.md
@@ -23,11 +23,7 @@ You will now deploy your application to the EC2 instances launched by the auto s
 1. Then clone the Koel GitHub repo:
 
 	```
-<<<<<<< HEAD
-	cd ~/environment/repos/ec2-spot-workshops/workshops/running-amazon-ec2-workloads-at-scale/
-=======
 	cd ~/environment/ec2-spot-workshops/workshops/running-amazon-ec2-workloads-at-scale/
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 
 	git clone https://github.com/phanan/koel.git
 

diff --git a/content/running-amazon-ec2-workloads-at-scale/deploy_lb.md b/content/running-amazon-ec2-workloads-at-scale/deploy_lb.md
@@ -27,11 +27,7 @@ Plese note the ARN of the application load balancer for use in an upcoming step.
 	aws elbv2 create-target-group --cli-input-json file://target-group.json
 	```
 {{% notice note %}}
-<<<<<<< HEAD
-Plese note the ARN of the application load balancer for use in an upcoming step.
-=======
 Plese note the ARN of the target group for use in an upcoming step.
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 {{% /notice %}}
 
 1. Edit **modify-target-group.json** and update the value of **%TargetGroupArn%** with the ARN. Save the file. Modify the target group:

diff --git a/content/running-amazon-ec2-workloads-at-scale/launch_cloudformation.md b/content/running-amazon-ec2-workloads-at-scale/launch_cloudformation.md
@@ -9,11 +9,7 @@ To save time on the initial setup, a CloudFormation template will be used to cre
 
 #### To create the stack
 
-<<<<<<< HEAD
-1. You can view and download the CloudFormation temlate from GitHub [here](https://raw.githubusercontent.com/awslabs/ec2-spot-workshops/master/workshops/running-amazon-ec2-workloads-at-scale/running-amazon-ec2-workloads-at-scale.yaml).
-=======
 1. You can view and download the CloudFormation template from GitHub [here](https://raw.githubusercontent.com/awslabs/ec2-spot-workshops/master/workshops/running-amazon-ec2-workloads-at-scale/running-amazon-ec2-workloads-at-scale.yaml).
->>>>>>> f71b4f10fe414e7ea3a78ffc9edca3e9a3f6ce59
 
 1. Take a moment to review the CloudFormation template so you understand the resources it will be creating.
 

diff --git a/layouts/partials/menu-footer.html b/layouts/partials/menu-footer.html
@@ -13,4 +13,5 @@ <h5 class="copyright">&copy; 2019 Amazon Web Services, Inc. or its Affiliates. A
 
 </left>
 <!-- Place this tag in your head or just before your close body tag. -->
-<script async defer src="https://buttons.github.io/buttons.js"></script> 
+<script async defer src="https://buttons.github.io/buttons.js"></script>
+{{ partial "custom-footer.html" . }}