fix merge conflict for v0.1.2 release

aws-solutions · Oct 17, 2019 · 99a7be6 · 99a7be6
2 parents 05c6a8b + c71cf5d
commit 99a7be6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deployment/media-insights-stack.yaml b/deployment/media-insights-stack.yaml
@@ -89,9 +89,9 @@ Parameters:
   ApiIpList:
     Type: String
     Description:
-      CIDR block string.  Indicates which internet addresses can access Elastichsearch.
+      CIDR block string.  Indicates which internet addresses can access the MIE APIs.
       For example, 192.168.100.14/24 represents the IPv4 address 192.168.100.14 and its associated routing prefix
-      192.168.100.0, while the CIDR block 0.0.0.0/0 indicates that Elasticsearch is open to requests from all internet addresses.
+      192.168.100.0, while the CIDR block 0.0.0.0/0 indicates the APIs are open to requests from all internet addresses.
 
 Metadata:
   AWS::CloudFormation::Interface:

diff --git a/webapp/.env b/webapp/.env
@@ -5,4 +5,4 @@ VUE_APP_DATAPLANE_BUCKET=dataplane-bucket
 VUE_APP_AWS_REGION=cc-region-id
 VUE_APP_USER_POOL_ID=pool_id
 VUE_APP_USER_POOL_CLIENT_ID=clientid
-VUE_APP_IDENTITY_POOL_ID=identity:id
+VUE_APP_IDENTITY_POOL_ID=identity:id