Merge branch '2.6.x' into 2.7.x

crss-datainterface-task-ingest/crss-datainterface-task-ingest.yml

@@ -2,10 +2,9 @@ spring:
   crss-emdb:
     datasource:
       jdbcUrl: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
-           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.165)(PORT=1521))
-           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.166)(PORT=1521))
-           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.167)(PORT=1521)))
-           (CONNECT_DATA=(SERVICE_NAME=emdb)(SERVER=DEDICATED)))
+           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.162)(PORT=1521))
+           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.74.164)(PORT=1521)))
+           (CONNECT_DATA=(SERVICE_NAME=emdbdr)(SERVER=DEDICATED)))
       username: crss_tod
       password: crss_tod
       driverClassName: oracle.jdbc.OracleDriver