Merge "Fixed some bugs"

diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh
index e5a09df..55f58dd 100644 (file)
--- a/engine-d-standalone/src/main/assembly/bin/run.sh
+++ b/engine-d-standalone/src/main/assembly/bin/run.sh
@@ -59,12 +59,10 @@ fi
 export SERVICE_IP=`hostname -i | awk '{print $1}'`
 echo SERVICE_IP=${SERVICE_IP}
 
-if [ ! -z ${TESTING} ] && [ ${TESTING} = 1 ]; then
-    if [ ! -z ${HOST_IP} ]; then
-        export HOSTNAME=${HOST_IP}:9102
-    else
-        export HOSTNAME=${SERVICE_IP}:9102
-    fi
+if [ ! -z ${HOST_IP} ]; then
+    export HOSTNAME=${HOST_IP}:9102
+else
+    export HOSTNAME=${SERVICE_IP}:9102
 fi
 
 export DB_PORT=5432

diff --git a/pom.xml b/pom.xml
index fa6b755..34a7194 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
         <dependency>
             <groupId>org.onap.holmes.common</groupId>
             <artifactId>holmes-actions</artifactId>
-            <version>1.3.7</version>
+            <version>1.3.8</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.dropwizard</groupId>