Skip to content

Conversation

@mr-c
Copy link
Contributor

@mr-c mr-c commented Jan 25, 2015

@ctb I'd like to include some of your changes. Should I just cherry-pick and copy what I want from the 'ngs2014' branch or make this branch mergeable?

@ctb
Copy link
Member

ctb commented Jan 26, 2015

cherry pick or copy, I guess.

On Sun, Jan 25, 2015 at 11:18:57AM -0800, Michael R. Crusoe wrote:

@ctb I'd like to include some of your changes. Should I just cherry-pick and copy what I want from the 'ngs2014' branch or make this branch mergeable?
You can view, comment on, or merge this pull request online at:

#146

-- Commit Summary --

  • update amazon instructions
  • clean up 1
  • install samtools via apt-get
  • fixes for 14.04
  • fiz
  • updated fastqc version
  • change sequence
  • minor fixups

-- File Changes --

D amazon/custom-ami.txt (125)
A amazon/images/amazon-1.png (0)
A amazon/images/amazon-2.png (0)
A amazon/images/amazon-3.png (0)
A amazon/images/amazon-4.png (0)
A amazon/images/amazon-5.png (0)
A amazon/images/amazon-6.png (0)
A amazon/images/amazon-7.png (0)
A amazon/images/amazon-8.png (0)
A amazon/images/amazon-9.png (0)
A amazon/images/amazon-diff-ami.png (0)
D amazon/images/ec2-1.png (0)
D amazon/images/ec2-2.png (0)
D amazon/images/ec2-3.png (0)
D amazon/images/ec2-4.png (0)
D amazon/images/ec2-5.png (0)
D amazon/images/ec2-6.png (0)
D amazon/images/ec2-7.png (0)
D amazon/images/ec2-8.png (0)
D amazon/images/ec2-9.png (0)
D amazon/images/ec2-create-img1.png (0)
D amazon/images/ec2-create-img2.png (0)
D amazon/images/ec2-dashboard-instance-name.png (0)
D amazon/images/ec2-security.png (0)
A amazon/images/terminate-1.png (0)
A amazon/images/terminate-2.png (0)
M amazon/images/win-putty-2.png (0)
M amazon/images/win-putty-3.png (0)
M amazon/images/win-putty-4.png (0)
M amazon/images/win-puttygen-2.png (0)
M amazon/index.txt (27)
M amazon/installing-dropbox.txt (8)
M amazon/log-in-with-ssh-mac.txt (28)
M amazon/log-in-with-ssh-win.txt (32)
D amazon/security-rules.txt (15)
M amazon/start-up-an-ec2-instance.txt (98)
A amazon/starting-up-a-custom-ami.txt (21)
A amazon/technical-guide.txt (12)
A amazon/terminating-your-instance.txt (19)
M mrnaseq/1-quality.txt (294)
M mrnaseq/3-big-assembly.txt (20)
M mrnaseq/installing-blastkit.txt (15)

-- Patch Links --

https://github.com/ged-lab/khmer-protocols/pull/146.patch
https://github.com/ged-lab/khmer-protocols/pull/146.diff


Reply to this email directly or view it on GitHub:
#146

C. Titus Brown, ctb@msu.edu

@ctb
Copy link
Member

ctb commented Feb 26, 2015

Updated from master; probably needs review. I plan to work off of this branch for a bit, but if someone else wants to take a look, would be appreciated. @mr-c @SherineAwad

@SherineAwad
Copy link
Contributor

Sure, I will take a deep look and be back soon.

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.

3 participants