[trafficcontrol] 01/06: Naming consistency

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 84cb41f588975f299ac5b568428325831ef0bcff
Author: Brennan Fieck <Br...@comcast.com>
AuthorDate: Thu Jul 19 18:56:39 2018 +0000

    Naming consistency
---
 infrastructure/cdn-in-a-box/docker-compose.yml | 3 +++
 infrastructure/cdn-in-a-box/edge/setup.sh      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/infrastructure/cdn-in-a-box/docker-compose.yml b/infrastructure/cdn-in-a-box/docker-compose.yml
index 14e0bc1..1f98325 100644
--- a/infrastructure/cdn-in-a-box/docker-compose.yml
+++ b/infrastructure/cdn-in-a-box/docker-compose.yml
@@ -137,6 +137,7 @@ services:
     ports:
       - "80:80"
 
+
   # trafficvault runs a riak container to store private keys
   trafficvault:
     image: basho/riak-kv
@@ -164,8 +165,10 @@ services:
     build:
       context: edge
     domainname: cdn.local
+
     env_file:
       - variables.env
+
     hostname: edge
     networks:
       - tcnet
diff --git a/infrastructure/cdn-in-a-box/edge/setup.sh b/infrastructure/cdn-in-a-box/edge/setup.sh
index 79c8407..7642d87 100755
--- a/infrastructure/cdn-in-a-box/edge/setup.sh
+++ b/infrastructure/cdn-in-a-box/edge/setup.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/bash
 
+<<<<<<< HEAD
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -17,6 +18,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+=======
+>>>>>>> Added edge cache
 set -e
 set -x
 set -m