Skip to content
This repository has been archived by the owner on Nov 16, 2021. It is now read-only.

Merge PR #2392 from Drush #192

Merged
merged 3 commits into from
Oct 26, 2016
Merged

Merge PR #2392 from Drush #192

merged 3 commits into from
Oct 26, 2016

Conversation

phenaproxima
Copy link
Collaborator

@phenaproxima phenaproxima commented Oct 26, 2016

According to #191, Drush's make-convert command is currently broken when dealing with certain Composer branch aliases, resulting in busted-ass makefiles being generated by our packaging script. The problem in Drush was fixed by drush-ops/drush#2392, so we need to merge that fix into our own Drush as a patch. That is what this here PR does.

@balsama
Copy link
Contributor

balsama commented Oct 26, 2016

Given this passes travis, I think this is ready to merge.

@phenaproxima phenaproxima merged commit 3a413b2 into 8.x-1.x Oct 26, 2016
@phenaproxima phenaproxima deleted the 8.x-drush-make-convert-fix branch October 26, 2016 15:38
@phenaproxima
Copy link
Collaborator Author

Travis is hurling random failures here and there, but they are not related to this. It's just Travis being insane. Merging.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants