Github user blrunner commented on the pull request:
https://github.com/apache/tajo/pull/317#issuecomment-68144062
Hi @hyunsik
Could you rebase sources against the apache master branch?
I can't merge as follows:
Auto-merging
tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
CONFLICT (content): Merge conflict in
tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
Auto-merging
tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
Automatic merge failed; fix conflicts and then commit the result.
---
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.
---
