Merge branch '2.3.x'

application-pemc-dev.yml

@@ -10,4 +10,8 @@ security.server.url: http://crssedge-server.marathon.l4lb.thisdcos.directory:808
 
 crss:
   api.gateway: http://edge-server.marathon.l4lb.thisdcos.directory:8080
-  security.url: http://edge-server.marathon.l4lb.thisdcos.directory:8080/uaa
+  security.url: http://edge-server.marathon.l4lb.thisdcos.directory:8080/uaa
+
+cfg:
+  general:
+    interval: 5

crss-mq-computation/crss-mq-computation-pemc-dev.yml

@@ -45,7 +45,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 5120
+          memory: 2560
           cpu: 0.5
     task:
       initialize:

crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-dev.yml

@@ -51,7 +51,7 @@ spring:
     deployer:
       mesos:
         chronos:
-          memory: 2048
+          memory: 1536
           cpu: 0.5
 
     task:

crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-dev.yml

@@ -31,9 +31,13 @@ spring:
     deployer:
       mesos:
         chronos:
-          memory: 6144
-          cpu: 1.5
+          memory: 1536
+          cpu: 0.5
 batch:
   partitionSize:
-    lr: 31
+    amsSp: 1500
+    amsInv: 1500
+    energyStl: 20
+    lr: 15
+    energyStlB: 150000