From 149a07df0af76455fce9789267b2a1fa2e361200 Mon Sep 17 00:00:00 2001 From: "Carlos Manzanedo Rueda (ruecarlo@)" Date: Tue, 26 Mar 2019 13:37:49 +0000 Subject: [PATCH 1/2] back to latest version --- README.md | 3 --- config.toml | 3 ++- content/authors.md | 4 ---- content/launching_ec2_spot_instances/_index.md | 4 ---- content/running-amazon-ec2-workloads-at-scale/_index.md | 4 ---- .../deploy_app_codedeploy.md | 4 ---- content/running-amazon-ec2-workloads-at-scale/deploy_lb.md | 4 ---- .../launch_cloudformation.md | 4 ---- layouts/partials/menu-footer.html | 3 ++- 9 files changed, 4 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 97791925..3ee764dc 100644 --- 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 index 306f2a18..cd2601bf 100644 --- 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 index c1c9c546..e77fac52 100644 --- 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 index 34549f9b..0ee26c80 100644 --- 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: "⁃ " --- diff --git a/content/running-amazon-ec2-workloads-at-scale/_index.md b/content/running-amazon-ec2-workloads-at-scale/_index.md index f4f79457..3ec9a62f 100644 --- 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: "⁃ " --- 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 index 70a5258c..0816b247 100644 --- 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 index d98ed429..92c9b923 100644 --- 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 index cb3af568..cd11ef2a 100644 --- 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 index f1f1986a..721c12c7 100644 --- a/layouts/partials/menu-footer.html +++ b/layouts/partials/menu-footer.html @@ -13,4 +13,5 @@
© 2019 Amazon Web Services, Inc. or its Affiliates. A - + +{{ partial "custom-footer.html" . }} From 644ad403fdc278cb8d1993e23783f7e990541c85 Mon Sep 17 00:00:00 2001 From: "Carlos Manzanedo Rueda (ruecarlo@)" Date: Tue, 26 Mar 2019 13:40:25 +0000 Subject: [PATCH 2/2] Changing order of workshops --- content/launching_ec2_spot_instances/_index.md | 2 +- content/running-amazon-ec2-workloads-at-scale/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/launching_ec2_spot_instances/_index.md b/content/launching_ec2_spot_instances/_index.md index 0ee26c80..114614bf 100644 --- a/content/launching_ec2_spot_instances/_index.md +++ b/content/launching_ec2_spot_instances/_index.md @@ -1,7 +1,7 @@ --- title: "Launching EC2 Spot Instances" date: 2019-01-31T08:51:33Z -weight: 10 +weight: 20 pre: "⁃ " --- diff --git a/content/running-amazon-ec2-workloads-at-scale/_index.md b/content/running-amazon-ec2-workloads-at-scale/_index.md index 3ec9a62f..0494dc3b 100644 --- a/content/running-amazon-ec2-workloads-at-scale/_index.md +++ b/content/running-amazon-ec2-workloads-at-scale/_index.md @@ -1,7 +1,7 @@ --- title: "Running EC2 Workloads at Scale with EC2 Auto Scaling" date: 2019-01-24T09:05:54Z -weight: 20 +weight: 10 pre: "⁃ " ---