zzh
/
gatk-3.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rodTesting' 

Conflicts:
	private/java/src/org/broadinstitute/sting/gatk/walkers/performance/ProfileRodSystem.java
This commit is contained in:
Mark DePristo 2011-08-22 17:43:47 -04:00
parent dc42571dd9 e728e407d9
commit 85c5a6f890
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/java/src/org/broadinstitute/sting/commandline/ArgumentTypeDescriptor.java
View File

@ -374,7 +374,7 @@ class RodBindingArgumentTypeDescriptor extends ArgumentTypeDescriptor {
FeatureManager.FeatureDescriptor featureDescriptor = manager.getByFiletype(file); FeatureManager.FeatureDescriptor featureDescriptor = manager.getByFiletype(file);
if ( featureDescriptor != null ) { if ( featureDescriptor != null ) {
tribbleType = featureDescriptor.getName(); tribbleType = featureDescriptor.getName();
logger.warn("Dynamically determined type of " + file + " to be " + tribbleType); logger.info("Dynamically determined type of " + file + " to be " + tribbleType);
} }
} }

2
public/java/src/org/broadinstitute/sting/gatk/GenomeAnalysisEngine.java
View File

@ -961,7 +961,7 @@ public class GenomeAnalysisEngine {
/** /**
* Get the list of intervals passed to the engine. * Get the list of intervals passed to the engine.
* @return List of intervals. * @return List of intervals, or null if no intervals are in use
*/ */
public GenomeLocSortedSet getIntervals() { public GenomeLocSortedSet getIntervals() {
return this.intervals; return this.intervals;