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

Update makefile and add the script I used to apply security patches for 16.01 #1793

Merged
merged 2 commits into from Feb 25, 2016

Conversation

@natefoo
Copy link
Member

natefoo commented Feb 24, 2016

xref #1499 and #715

@jmchilton

This comment has been minimized.

Copy link
Member

jmchilton commented Feb 25, 2016

This looks fantastic - not your fault but I am annoyed that it is going to conflict #1613 which has been open for 4 weeks.

jmchilton added a commit that referenced this pull request Feb 25, 2016
Update makefile and add the script I used to apply security patches for 16.01
@jmchilton jmchilton merged commit 7560677 into galaxyproject:dev Feb 25, 2016
2 of 4 checks passed
2 of 4 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
toolshed test Build finished. 590 tests run, 0 skipped, 18 failed.
Details
api test Build finished. 207 tests run, 0 skipped, 0 failed.
Details
framework test Build finished. 100 tests run, 0 skipped, 0 failed.
Details
@natefoo

This comment has been minimized.

Copy link
Member Author

natefoo commented Feb 25, 2016

Sorry 'bout that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.