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

Merge Dev to Master #171

Merged
merged 131 commits into from
Feb 24, 2017
Merged

Merge Dev to Master #171

merged 131 commits into from
Feb 24, 2017

Conversation

chgibb
Copy link
Owner

@chgibb chgibb commented Feb 12, 2017

Merge changes from the last 7 days.

A few bugs have been introduced:

  1. Some bowtie output is being alerted in input after indexing 15 fastas at once.
  2. Please confirm QC still works. OpenJDK 9 has broken FastQC. This will have to be investigated separately. Travis builds and runs tests fine under Oracle Java 7.
  3. Pileup is throwing an exception when trying to view a pileup for an alignment with a 0% alignment rate. This error should be intercepted and turned into something nicer looking than a stack trace into Q.js.

@jsbrn please investigate 1.
@scs97liu please investigate 2.
@pynner please investigate 3.


This change is Reviewable

scsliu0 and others added 30 commits January 28, 2017 11:23
Updating UI-shane to dev
Update Feature Branch
…into angularPlasmidTesting

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Revert "Update Feature Branch"
@chgibb
Copy link
Owner Author

chgibb commented Feb 24, 2017

Reviewed 6 of 46 files at r4, 6 of 46 files at r6, 6 of 54 files at r7, 48 of 48 files at r8.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

scsliu0 and others added 9 commits February 24, 2017 01:22
@chgibb
Copy link
Owner Author

chgibb commented Feb 24, 2017

Reviewed 14 of 15 files at r9, 1 of 1 files at r10.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@chgibb
Copy link
Owner Author

chgibb commented Feb 24, 2017

Reviewed 3 of 3 files at r11.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@chgibb chgibb merged commit 4cd2b75 into master Feb 24, 2017
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.

None yet

3 participants