Merge master into tosca-poc branch

This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master

With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical

Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 0 insertions, 35 deletions

diff --git a/extra/bin-for-dev/start-db.sh b/extra/bin-for-dev/start-db.sh
deleted file mode 100755
index 97f8de1f5..000000000
--- a/extra/bin-for-dev/start-db.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2019 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-# 
-###
-
-docker-compose -f ../docker/clamp/docker-compose.yml up -d db
-
-if [ "$1" = "test" ]; then
-    while ! (docker logs clamp_db_1  2>&1 | grep "socket: '/run/mysqld/mysqld.sock'  port: 3306  mariadb.org binary distribution" > /dev/null);
-    do   
-      echo "Waiting Mysql to be up with CLDSDB4 db loaded before loading the TEST DATA ..."
-      sleep 3
-    done
-    docker exec -it clamp_db_1 /docker-entrypoint-initdb.d/dump/load-fake-data.sh
-fi;