Merge discvr-24.7 to develop

Author: bbimber

PMR/resources/queries/study/pedigree.sql

@@ -23,7 +23,8 @@ AS status,
 d.id.demographics.calculated_status as status_code,
 d.id.demographics.species,
 '' as Display,
-'Demographics' as source
+'Demographics' as source,
+d.modified
 
 FROM study.demographicsParents d
 WHERE d.numParents > 0 and d.id.demographics.species IS NOT NULL

mcc/resources/queries/study/pedigree.sql

@@ -23,7 +23,8 @@ AS status,
 d.id.demographics.calculated_status as status_code,
 d.id.demographics.species,
 '' as Display,
-'Demographics' as source
+'Demographics' as source,
+d.modified
 
 FROM study.demographicsParents d
 WHERE d.numParents > 0 and d.id.demographics.species IS NOT NULL

primeseq/src/org/labkey/primeseq/pipeline/SequenceJobResourceAllocator.java

@@ -168,8 +168,8 @@ public Integer getMaxRequestMemory(PipelineJob job)
         // NOTE: STAR in particular needs more memory
         if (isCacheAlignerIndexesTask(job))
         {
-            job.getLogger().debug("setting memory to 24");
-            return 24;
+            job.getLogger().debug("setting memory to 36");
+            return 36;
         }
 
         if (isLuceneIndexJob(job))