Github user blrunner commented on the pull request:
https://github.com/apache/tajo/pull/98#issuecomment-51734603
Sorry for my late review.
Could you rebase against the master branch?
I failed to merge it as follows:
{code:xml}
CONFLICT (content): Merge conflict in
tajo-core/src/test/java/org/apache/tajo/cli/TestTajoCli.java
Auto-merging tajo-client/src/main/java/org/apache/tajo/cli/TajoCli.java
Automatic merge failed; fix conflicts and then commit the result.
{code}
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
