From e9c17062003374e6b698f7a70978e8faf8f46555 Mon Sep 17 00:00:00 2001 From: Francesco Cesareo Date: Thu, 29 Feb 2024 15:46:32 +0100 Subject: [PATCH] conflict resolved --- helm/values-uat.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 449ae02..37e69e3 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -66,8 +66,8 @@ microservice-chart: ENV: 'Azure Kubernetes' # SRC # ORACLEDB_CONNECTION_STRING: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCA_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))" -# jdbc:oracle:thin:@db-nodo-pagamenti.u.db-nodo-pagamenti.com:1524/NDPSPCA_PP_NODO4_CFG - ORACLEDB_CONNECTION_STRING: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti-prf.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCST_NODO4_CFG))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))" +# jdbc:oracle:thin:@db-nodo-pagamenti-prf.u.db-nodo-pagamenti.com:1524/NDPSPCST + ORACLEDB_CONNECTION_STRING: "jdbc:oracle:thin:@(DESCRIPTION=(ENABLE=BROKEN)(ADDRESS=(PROTOCOL=tcp)(PORT=1524)(HOST=db-nodo-pagamenti-prf.u.db-nodo-pagamenti.com))(CONNECT_DATA=(SERVICE_NAME=NDPSPCST))(SO_KEEPALIVE=true)(TCP_KEEPIDLE=60)(TCP_KEEPINTVL=30)(TCP_KEEPCNT=15))" ORACLEDB_USERNAME: "NODO4_CFG" ORACLEDB_DEFAULT_SCHEMA: "NODO4_CFG" # DST