Merging changes from master
Compare changes
Files
3- Bart Arendarczyk authored
@@ -44,6 +47,8 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
@@ -52,11 +57,11 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
@@ -68,98 +73,120 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
@@ -189,11 +216,13 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
@@ -203,9 +232,7 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
@@ -223,4 +250,5 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
\ No newline at end of file