Merge branch '2.0.x' into 2.1.x

crss-mq-computation/crss-mq-computation-pemc-uat-sit.yml

@@ -31,6 +31,14 @@ spring:
   redis:
     database: 4
 
+  jpa:
+    show-sql: true
+
+logging:
+  level:
+    com.pemc.crss: DEBUG
+    org.springframework.cloud: DEBUG
+
 batch:
   maxWorkers: 20
   partitionSize:

crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-dev2.yml

@@ -18,11 +18,16 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+
   profiles:
-        include: mesos
+    include: mesos
   cloud:
     deployer:
       mesos:
         chronos:
           memory: 2048
-          cpu: 0.5
+          cpu: 0.5
+
+  profiles:
+    include: mesos
+

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-dev2.yml

@@ -18,11 +18,13 @@ spring:
       username: crss_meterprocess
       password: crss_meterprocess
       driverClassName: org.postgresql.Driver
+
   profiles:
-          include: mesos
+    include: mesos
   cloud:
     deployer:
       mesos:
         chronos:
           memory: 2048
-          cpu: 0.5
+          cpu: 0.5
+