Merge branch '2.3.x'

crss-edge/crss-edge-public.yml

@@ -36,8 +36,8 @@ hystrix:
 ribbon:
   ConnectTimeout: 300000
   ReadTimeout: 600000
-  maxAutoRetries: 1
-  MaxAutoRetriesNextServer: 2
+  maxAutoRetries: 5
+  MaxAutoRetriesNextServer: 10
 
 # NOTE: since the server is undertow who serve the static pages, the uploads config must be set here also
 #       if size was modified please update also the registration's application.yml

crss-edge/crss-edge.yml

@@ -94,8 +94,8 @@ hystrix:
 ribbon:
   ConnectTimeout: 300000
   ReadTimeout: 600000
-  maxAutoRetries: 1
-  MaxAutoRetriesNextServer: 2
+  maxAutoRetries: 5
+  MaxAutoRetriesNextServer: 10
 
 # NOTE: since the server is undertow who serve the static pages, the uploads config must be set here also
 #       if size was modified please update also the registration's application.yml

crss-mq-computation/crss-mq-computation.yml

@@ -53,7 +53,7 @@ spring:
       mesos:
         chronos:
           apiEndpoint: http://master.mesos/service/chronos/v1
-          memory: 16384
+          memory: 18432
           cpu: 4
         dcos:
           authorizationToken: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJkY29zX2hpc3Rvcnlfc2VydmljZSIsImV4cCI6NDY1NTE3ODM0OX0.erK7saZPxkEOP6k1S8CNvITHQ1SyEUj1cW5qx4GTQU-MPOwxMsFAcFYO0zAthXPYQSzaRxykTelkLMJTsSQVro9bGJcHua7SedIqCmq1TvAUBSJugyxsDxu07mmS-Yh7MwpmG3LAOItwCYzWhihMqdLKRA19iimAs8xS6V5uKo5U5Fq1lOAQ0ye4f4L9CgF8WWyIqILdpynLRIx_eViY5RWtqYznV8otg0jkJGsjHQQmPZa732NY0crJtDcN713wVqT4SZoG993-Zv4mH_RU0a7NbwtvFE1mCfmja1aMp_gtogdS3xdQvRcS1BzaoJs4_dGUvRoQdUeseuTbHkF6VQ