rebase adam master into adam2bam branch #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 2052521. Conflicts: adam-core/src/test/resources/interleaved_multiline_fastq.ifq adam-core/src/test/resources/interleaved_multiline_fastq.ifq.output adam-core/src/test/scala/org/bdgenomics/adam/io/InterleavedFastqInputFormatSuite.scala adam-core/src/test/scala/org/bdgenomics/adam/io/SingleFastqInputFormatSuite.scala adam-core/src/test/scala/org/bdgenomics/adam/rdd/read/ADAMAlignmentRecordContextSuite.scala
Fix parent reference in distribution module
fixes bigdatagenomics#676 - formatting / unnecessary `.toString` nits - one more header fix - whitespace nits
fixes bigdatagenomics#687 - remove out-of-date @param scaladocs
make adamLoad public
fix BAM/SAM header setting when writing on cluster
GeneFeatureRDDFunctions → FeatureRDDFunctions
removing in bigdatagenomics#684 was a mistake, assumed it was redundant but it's not!
restore clause guarding pruneCache check
rebase fork
antonstamov
pushed a commit
that referenced
this pull request
Jun 3, 2015
rebase adam master into adam2bam branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.