From d6e7b63cc580e7b3822be61fe92a493ad5e222a3 Mon Sep 17 00:00:00 2001 From: "Nelson, Thomas (arthurdent3)" Date: Thu, 9 May 2019 14:16:37 +0000 Subject: Changes Listed below: - Added build version API - Updated Keyspace active to use Properties setting - Update Libraries Netty,jbcrypt,Jackson Databind and log4j - Removed some irrelivant files - Updated some usint tests to ignore some tests(This will be updated soon) - Bugfixes - Missing Values, inform user. - Respond with proper error - Fix Locking Contention issue. - Add locking retry for atomic calls. Change-Id: Ie218dd92edb0c20e4a0efe33eeaaec84e5293c44 Issue-ID: MUSIC-393 Signed-off-by: Nelson, Thomas (arthurdent3) --- distribution/cassandra_job/Dockerfile | 21 +++++++++++++++++++++ distribution/cassandra_job/runcql.sh | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) (limited to 'distribution/cassandra_job') diff --git a/distribution/cassandra_job/Dockerfile b/distribution/cassandra_job/Dockerfile index 528c3bf4..937afdee 100644 --- a/distribution/cassandra_job/Dockerfile +++ b/distribution/cassandra_job/Dockerfile @@ -1,3 +1,24 @@ +# +# ============LICENSE_START========================================== +# org.onap.music +# =================================================================== +# Copyright (c) 2019 AT&T Intellectual Property +# =================================================================== +# 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============================================= +# ==================================================================== + #registry.hub.docker.com/ FROM library/cassandra:3.11 ENV DEF_USER=cassandra diff --git a/distribution/cassandra_job/runcql.sh b/distribution/cassandra_job/runcql.sh index 2ffd5f2f..89396bfc 100644 --- a/distribution/cassandra_job/runcql.sh +++ b/distribution/cassandra_job/runcql.sh @@ -1,4 +1,25 @@ #! /bin/bash +# +# ============LICENSE_START========================================== +# org.onap.music +# =================================================================== +# Copyright (c) 2019 AT&T Intellectual Property +# =================================================================== +# 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============================================= +# ==================================================================== + if [ -z "$TIMEOUT" ]; then TIMEOUT=10; fi -- cgit 1.2.3-korg