Merge branch 'master' of http://git.prod.crss.wesmsys.local/crss/config

resolved conflict for crss-admin.yml

crss-dataflow-app/crss-dataflow-app.yml

@@ -85,7 +85,7 @@ scheduler:
   launch-timeout-seconds: 86400
 #  add additional keys from JobProcess.envKey if you need to fine-grain the job execution timeout for a specific job
   job-execution-timeout-minutes:
-    default: 480 #8 hours
+    default: 240 #8 hours
 
 # temporary todi-config, to be moved to general config
 todi-config:

crss-reg/crss-reg-dev.yml

@@ -13,6 +13,11 @@ spring:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss?currentSchema=dataflow
       username: postgres
       password: postgres
+  crss-admin:
+    datasource:
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss?currentSchema=admin
+      username: postgres
+      password: postgres
   crss-meterprocess:
     datasource:
       jdbcUrl: jdbc:postgresql://localhost:5432/crss?currentSchema=meterprocess

crss-reg/crss-reg-dev2.yml

@@ -14,6 +14,11 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
+  crss-admin:
+    datasource:
+      jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=admin
+      username: crss_admin
+      password: crss_admin
   crss-meterprocess:
     datasource:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss?currentSchema=meterprocess

crss-reg/crss-reg-pemc-dev.yml

@@ -19,6 +19,11 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
+  crss-admin:
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=admin
+      username: crss_admin
+      password: YReYA7fI
   xdf-control:
     datasource:
       driverClassName: org.postgresql.Driver

crss-reg/crss-reg.yml

@@ -13,6 +13,11 @@ spring:
       jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
+  crss-admin:
+    datasource:
+      jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=admin
+      username: crss_admin
+      password: YReYA7fI
   crss-meterprocess:
     datasource:
       jdbcUrl: jdbc:edb://${crss.database.ip}:5432/crss?currentSchema=meterprocess