Apply changes from master to 0.12 dev branch#3158
Closed
kritzcreek wants to merge 2 commits into
Closed
Conversation
* Update Glob library, fixes purescript#3055 Also update the Stackage snapshot so that we get the latest version of Glob, which includes memory usage and performance fixes. * Reduce timeout threshold to help avoid CI failures
hdgarrood
approved these changes
Nov 21, 2017
hdgarrood
left a comment
Contributor
There was a problem hiding this comment.
Oops, forgot about this.
Member
I think there's a flag or environment variable you can set, but wouldn't it be better to merge The diff seem to be only the commits you want at the moment: 0.12.0-dev...master |
Member
Author
|
See #3159 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the work of @hdgarrood and @Thimoteus , but I don't know how to preserve authorship during cherry picking.