Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ADAM-375] Upgrade to Hadoop-BAM 7.0.0. #376

Merged
merged 1 commit into from
Sep 16, 2014

Conversation

fnothaft
Copy link
Member

Closes #375:

  • Migrates to Hadoop-BAM 7.0.0
  • Moves from samtools/picard/tribble/variant to htsjdk 1.118

HT to @AndreSchumacher

@fnothaft
Copy link
Member Author

Rebased on master.

@fnothaft fnothaft changed the title Upgrade to Hadoop-BAM 7.0.0. [ADAM-375] Upgrade to Hadoop-BAM 7.0.0. Sep 12, 2014
@fnothaft fnothaft added this to the 0.14.0 milestone Sep 13, 2014
@fnothaft
Copy link
Member Author

Rebased.

@tdanford
Copy link
Contributor

Can you rebase one more time, @fnothaft?

@fnothaft
Copy link
Member Author

Rebased!

@fnothaft
Copy link
Member Author

Rererebased.

@fnothaft
Copy link
Member Author

Rerererebased.

@@ -49,7 +49,7 @@
* format.
*
* This reader is based on the FastqInputFormat that's part of Hadoop-BAM,
* found at http://sourceforge.net/p/hadoop-bam/code/ci/master/tree/src/fi/tkk/ics/hadoop/bam/FastqInputFormat.java
* found at http://sourceforge.net/p/hadoop-bam/code/ci/master/tree/src/org.seqdoop.hadoop_bam/FastqInputFormat.java
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This URL returns a 404. Search-replace issue?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ja. Will fix...

@massie
Copy link
Member

massie commented Sep 16, 2014

Once the URL is fixed, I'm ready to merge this. Thanks, Frank!

@fnothaft
Copy link
Member Author

Rererererebased + URL fixed.

massie added a commit that referenced this pull request Sep 16, 2014
[ADAM-375] Upgrade to Hadoop-BAM 7.0.0.
@massie massie merged commit d1d64e2 into bigdatagenomics:master Sep 16, 2014
@massie
Copy link
Member

massie commented Sep 16, 2014

Thanks, Frank!

@fnothaft fnothaft deleted the htsjdk-migration branch September 16, 2014 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move to htsjdk/new Hadoop-BAM
4 participants