Skip to content
Please note that GitHub no longer supports your web browser.

We recommend upgrading to the latest Google Chrome or Firefox.

Learn more

/container-metfrag forked from sneumann/container-metfrag

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

Updating master to be level with sneumann #1

Merged
merged 23 commits into from Nov 20, 2019
+26 −4

Conversation

@schymane
Copy link
Owner

schymane commented Nov 20, 2019

No description provided.

sneumann and others added 23 commits Feb 5, 2019
@sneumann
Fix git checkout of old version
f5a10e7
@sneumann
don't do shallow clone
a3bcb0e
@sneumann
Go back further in time
b4e9557
@sneumann
Revert checking out old version
cf2efe5
@sneumann
Add default RAM/CPU limits
37b7a9d
@sneumann
Configurable WAR name
c5b832d
@sneumann
Raise -Xmx for tomcat against java.lang.OutOfMemoryError: Java heap s…
bfd0a99 
…pace
@sneumann
dummy change
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
fcb2501
@sneumann
Dummy: undo WORKDIR to trigger container build
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
9ccf3ea
@sneumann
dummy change for new build
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
317cc14
@sneumann
Update Dockerfile
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
a713757
@sneumann
Merge pull request #1 from sneumann/sneumann-patch-1
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
ac7599c 
Include HMDB4 CSV
@sneumann
Add WormJam local file
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
8cfb4c9 
Thanks to Emma Schymanski and Michael Witting for preparing!
@sneumann
Updated WormJam file
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
341e0dc
@sneumann
Adding Yeast YMDB2
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
8001dc1
@sneumann
Added Zebrafish
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
514d07c
@sneumann
CompTox update
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
573a57d
@sneumann
Add Natural Products Atlas
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
26056c1 
Justin had the great idea to add the Natural Products Atlas (NPAtlas) as a local CSV for MetFrag
and Emma packaged it for MetFrag
@schymane
added NORMAN SusDat
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
89f4dd3
@schymane
Updated Zebrafish file
8d8bfcc 
New version of Zebrafish file available
@schymane
add COCONUT
d0e4c99 
c/o Maria Sorokina from Steinbeck group, FSU Jena
@sneumann
Merge pull request sneumann#3 from schymane/patch-1
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
a223280 
New local CSV files
@sneumann
Merge pull request sneumann#4 from sneumann/sneumann-patch-1
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
964d3e3 
Sneumann patch 1
@schymane schymane merged commit a08cd15 into schymane:master Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@schymane @sneumann
You can’t perform that action at this time.