Merge branch '2.0.x' into 2.0.x-updates

  + fix conflicts

Conflicts:
	crss-admin/crss-admin-top.yml
	crss-settlement-task-calculation/crss-settlement-task-calculation.yml

crss-admin/crss-admin-top.yml

@@ -13,6 +13,8 @@ spring:
         smtp:
           auth: true
           starttls.enable: true
+    subject:
+        prefix: "[CRSS 2.0 - Trial Operation]"
 crss:
   ldap:
     protocol: LDAPS

crss-admin/crss-admin.yml

@@ -10,6 +10,9 @@ spring:
   resources:
     chain:
       gzipped: true
+  mail:
+    subject:
+      prefix: ""
 feign:
   hystrix:
     enabled: false
@@ -21,4 +24,4 @@ crss:
       DOE: DOE@mail.com
       ERC: ERC@mail.com
       PEMBOARD: PEMBOARD@mail.com
-      MSP: MSP@mail.com
+      MSP: MSP@mail.com

crss-settlement-task-calculation-addtlcomp/application-pemc-uat-sit.yml

@@ -0,0 +1,79 @@
+spring:
+  crss-stl:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=settlement
+      username: crss_settlement
+      password: crss_settlement
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-main:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=meterprocess
+      username: crss_meterprocess
+      password: crss_meterprocess
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-metering:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=metering
+      username: crss_metering
+      password: crss_metering
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-nmms:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=nmms
+      username: crss_nmms
+      password: crss_nmms
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  crss-dataflow:
+    datasource:
+      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
+      username: crss_dataflow
+      password: crss_dataflow
+      driverClassName: org.postgresql.Driver
+      connectionTimeout: 10000
+      maxPoolSize: 2
+  profiles:
+    include: mesos
+  cloud:
+    deployer:
+      mesos:
+        chronos:
+          apiEndpoint: http://master.mesos/service/chronos/v1
+          memory: 8192
+          cpu: 2
+    task:
+      initialize:
+        enable: false
+  batch:
+    initializer:
+      enabled: false
+    job:
+      enabled: true
+
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        generate_statistics: false
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
+
+  redis:
+    database: 5
+
+logging:
+  level:
+    com.pemc: DEBUG
+    com.netflix: DEBUG
+    org.springframework.cloud: DEBUG
+    org.hibernate.stat: debug

crss-settlement-task-calculation/crss-settlement-task-calculation-dev2.yml

@@ -76,6 +76,28 @@ spring:
     host: redis.marathon.l4lb.thisdcos.directory
     port: 6379
 
+batch:
+  chunkSize: 100
+  maxWorkers: 10
+  partitionSize:
+    retDat: 900
+    retBcq: 20000
+    calcEta: 3000
+    procNss: 3000
+    nss: 1000
+    disAggBcq: 1000
+    disAggBcqBuyer: 1000
+    disAggBcqSeller: 1000
+    rta: 300
+    rprta: 1000
+    rcra: 200
+    sFactor: 150
+    runway: 150
+    spotSeller: 1500
+    spotBuyer: 1500
+    gmr: 1500
+
+
 logging:
   level:
     com.pemc.crss.settlement.task.calculation: DEBUG

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

@@ -59,17 +59,18 @@ batch:
   chunkSize: 100
   maxWorkers: 10
   partitionSize:
-    retDat: 120
-    retBcq: 120
-    calcEta: 150
-    procNss: 150
-    nss: 150
-    disAggBcq: 120
-    disAggBcqBuyer: 120
-    disAggBcqSeller: 120
-    rta: 150
-    rprta: 150
-    rcra: 150
+    retDat: 300
+    retBcq: 20000
+    calcEta: 1000
+    procNss: 3000
+    nss: 1000
+    nssTot: 20000
+    disAggBcq: 1000
+    disAggBcqBuyer: 1000
+    disAggBcqSeller: 1000
+    rta: 300
+    rprta: 500
+    rcra: 200
     sFactor: 150
     runway: 150
     spotSeller: 1500