From 925af6d18870462f099fd6b0daa2fceed1cbfa46 Mon Sep 17 00:00:00 2001 From: yizhako Date: Sun, 12 May 2024 16:14:11 +0300 Subject: [PATCH 1/3] change description --- aws/templates/gwlb-asg/README.md | 4 ++++ aws/templates/gwlb-asg/qs-gwlb-master.yaml | 5 ----- aws/templates/gwlb-asg/qs-gwlb.yaml | 5 ----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/aws/templates/gwlb-asg/README.md b/aws/templates/gwlb-asg/README.md index 26eda643..2762bcd4 100644 --- a/aws/templates/gwlb-asg/README.md +++ b/aws/templates/gwlb-asg/README.md @@ -48,7 +48,11 @@ Deploys and configures a Quick Start AWS Auto Scaling Group configured for Gateway Load Balancer in a Centralized Security VPC, and Servers in Servers VPC.

For more details, refer to CloudGuard Network for AWS Centralized Gateway Load Balancer R80.40 Deployment Guide. +<<<<<<< HEAD Deploys a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, optionally a Security Management Server into an existing Security VPC, Gateway Load Balancer Endpoints (1 per Availability Zone), Application Load Balancer and Servers into an existing Servers' VPC.
+======= + Deploys a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, optionally a Security Management Server into an existing Security VPC, Gateway Load Balancer Endpoints (1 per Availability Zone), Application Load Balancer and Servers into an existing in Servers' VPC.
+>>>>>>> 6667c7f (remove message) diff --git a/aws/templates/gwlb-asg/qs-gwlb-master.yaml b/aws/templates/gwlb-asg/qs-gwlb-master.yaml index 0d7f5b74..c95da46e 100644 --- a/aws/templates/gwlb-asg/qs-gwlb-master.yaml +++ b/aws/templates/gwlb-asg/qs-gwlb-master.yaml @@ -529,9 +529,6 @@ Parameters: Type: String Default: R81.20-BYOL AllowedValues: - - R80.40-BYOL - - R80.40-PAYG-NGTP - - R80.40-PAYG-NGTX - R81.20-BYOL - R81.20-PAYG-NGTP - R81.20-PAYG-NGTX @@ -700,8 +697,6 @@ Parameters: Type: String Default: R81.20-BYOL AllowedValues: - - R80.40-BYOL - - R80.40-PAYG - R81-BYOL - R81-PAYG - R81.10-BYOL diff --git a/aws/templates/gwlb-asg/qs-gwlb.yaml b/aws/templates/gwlb-asg/qs-gwlb.yaml index bb828036..1e560d67 100644 --- a/aws/templates/gwlb-asg/qs-gwlb.yaml +++ b/aws/templates/gwlb-asg/qs-gwlb.yaml @@ -434,9 +434,6 @@ Parameters: Type: String Default: R81.20-BYOL AllowedValues: - - R80.40-BYOL - - R80.40-PAYG-NGTP - - R80.40-PAYG-NGTX - R81.20-BYOL - R81.20-PAYG-NGTP - R81.20-PAYG-NGTX @@ -605,8 +602,6 @@ Parameters: Type: String Default: R81.20-BYOL AllowedValues: - - R80.40-BYOL - - R80.40-PAYG - R81-BYOL - R81-PAYG - R81.10-BYOL From 5194b5154523319306355378d606da71e4d20ce8 Mon Sep 17 00:00:00 2001 From: yizhako Date: Sun, 12 May 2024 16:18:28 +0300 Subject: [PATCH 2/3] fix message --- aws/templates/gwlb-asg/README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/aws/templates/gwlb-asg/README.md b/aws/templates/gwlb-asg/README.md index 2762bcd4..d22e2012 100644 --- a/aws/templates/gwlb-asg/README.md +++ b/aws/templates/gwlb-asg/README.md @@ -48,11 +48,7 @@ Deploys and configures a Quick Start AWS Auto Scaling Group configured for Gateway Load Balancer in a Centralized Security VPC, and Servers in Servers VPC.

For more details, refer to CloudGuard Network for AWS Centralized Gateway Load Balancer R80.40 Deployment Guide. -<<<<<<< HEAD - Deploys a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, optionally a Security Management Server into an existing Security VPC, Gateway Load Balancer Endpoints (1 per Availability Zone), Application Load Balancer and Servers into an existing Servers' VPC.
-======= Deploys a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, optionally a Security Management Server into an existing Security VPC, Gateway Load Balancer Endpoints (1 per Availability Zone), Application Load Balancer and Servers into an existing in Servers' VPC.
->>>>>>> 6667c7f (remove message) From c7238ed9320a81a8192c60a2eff540f476550245 Mon Sep 17 00:00:00 2001 From: yizhako Date: Sun, 12 May 2024 16:20:39 +0300 Subject: [PATCH 3/3] fix message --- aws/templates/gwlb-asg/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/templates/gwlb-asg/README.md b/aws/templates/gwlb-asg/README.md index d22e2012..26eda643 100644 --- a/aws/templates/gwlb-asg/README.md +++ b/aws/templates/gwlb-asg/README.md @@ -48,7 +48,7 @@ Deploys and configures a Quick Start AWS Auto Scaling Group configured for Gateway Load Balancer in a Centralized Security VPC, and Servers in Servers VPC.

For more details, refer to CloudGuard Network for AWS Centralized Gateway Load Balancer R80.40 Deployment Guide. - Deploys a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, optionally a Security Management Server into an existing Security VPC, Gateway Load Balancer Endpoints (1 per Availability Zone), Application Load Balancer and Servers into an existing in Servers' VPC.
+ Deploys a Gateway Load Balancer, Check Point CloudGuard IaaS Security Gateway Auto Scaling Group, optionally a Security Management Server into an existing Security VPC, Gateway Load Balancer Endpoints (1 per Availability Zone), Application Load Balancer and Servers into an existing Servers' VPC.