From: varun gudisena <vg411h@att.com>
Date: Fri, 7 Sep 2018 04:52:22 +0000 (+0000)
Subject: Merge "quoted props"
X-Git-Tag: 2.1.2~59
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=10f3375fef68fdcb935290d2e193a84f3cf572d5;hp=89c662c2a7c50eb533256497de0420ba1176fe13;p=aaf%2Fauthz.git

Merge "quoted props"
---

diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh
index d7ba9fb6..b969a346 100644
--- a/auth/docker/dpush.sh
+++ b/auth/docker/dpush.sh
@@ -4,7 +4,7 @@
 # Pull in Variables from d.props
 . ./d.props
 
-AAF_COMPONENTS=$(cat components)
+AAF_COMPONENTS="$(cat components) core agent config"
 
 for AAF_COMPONENT in ${AAF_COMPONENTS}; do
         # docker push ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${OLD_VERSION}
diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
index 46c85be9..a8b8b9a6 100644
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -119,7 +119,7 @@ if [ ! "$CMD" = "" ]; then
 	    if [ "$ADD" = "Y" ]; then
 		echo $2 >> $F
 	    else 
-                sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
+               sed -i.backup -e "s/\\(${1}.*=\\).*/\\1${2}/" $F
 	    fi
             cat $F
         done
diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props
index 4a5d0716..1e16c3d4 100644
--- a/auth/sample/local/aaf.props
+++ b/auth/sample/local/aaf.props
@@ -20,3 +20,4 @@ cadi_x509_issuers=
 # Other
 aaf_data_dir=/opt/app/osaaf/data
 cadi_token_dir=/opt/app/osaaf/tokens
+cadi_loglevel=WARN
diff --git a/pom.xml b/pom.xml
index 6310290b..985160e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<groupId>org.onap.aaf.authz</groupId>
 	<artifactId>parent</artifactId>
 	<version>2.1.2-SNAPSHOT</version>
-	<name>AAF Overall Parent</name>
+	<name>aaf-authz</name>
 	<packaging>pom</packaging>
 
 	<parent>