Merge remote-tracking branch 'upstream/master'

dheren-git · dheren-git · commit f29f5cbb0519 · 2018-03-27T09:18:46.000+05:30
diff --git a/submodules/quickstart-linux-bastion b/submodules/quickstart-linux-bastion
@@ -1 +1 @@
-Subproject commit cdca025c8f267aab121c2af9158e936a51130775
+Subproject commit 2cd957e973fe0009d9581085a5af44ec62cb6316
diff --git a/templates/ibm-spectrum-scale-master.template b/templates/ibm-spectrum-scale-master.template
@@ -724,6 +724,12 @@
                             "Outputs.PublicSubnet2ID"
                         ]
                     },
+                    "QSS3BucketName": {
+                        "Ref": "QSS3BucketName"
+                    },
+                    "QSS3KeyPrefix": {
+                        "Fn::Sub": "${QSS3KeyPrefix}submodules/quickstart-linux-bastion/"
+                    },
                     "RemoteAccessCIDR": {
                         "Ref": "RemoteAccessCIDR"
                     },
diff --git a/templates/ibm-spectrum-scale-subnet.template b/templates/ibm-spectrum-scale-subnet.template
@@ -1,6 +1,10 @@
         {
     "AWSTemplateFormatVersion": "2010-09-09",
+<<<<<<< HEAD
     "Description": "This template creates a one private subnet and NAT Gateway for one Availability Zone. If you deploy this template in a region that doesn't support NAT gateways, NAT instances are deployed instead. **WARNING** This template will only call when user choose dataReplica=1.",
+=======
+    "Description": "This template creates a private subnet and NAT Gateway in a single Availability Zone. If you deploy this template in a region that doesn't support NAT gateways, NAT instances are deployed instead. This template is used only when dataReplica=1.",
+>>>>>>> upstream/master
     "Parameters": {
         "VPCCIDR": {
             "Description": "CIDR block for the VPC.",
