Github user ilooner commented on the issue:
https://github.com/apache/drill/pull/1057
@Ben-Zvi resolved conflicts. They were minor formatting conflicts. I will
mark it as ready-to-commit again since there were no changes, please let me
know if there are any issues.---
