Merge "quoted props"

diff --git a/auth/docker/dpush.sh b/auth/docker/dpush.sh
index d7ba9fb..b969a34 100644 (file)
--- 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 46c85be..a8b8b9a 100644 (file)
--- 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 4a5d071..1e16c3d 100644 (file)
--- 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 6310290..985160e 100644 (file)
--- 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>