Github user blrunner commented on the pull request:
https://github.com/apache/tajo/pull/621#issuecomment-120697936
Thanks you for your great work.
Could you rebase this patch against the master branch?
I failed to merge it with following messages.
{code:xml}
$ git pull https://github.com/hyunsik/tajo TAJO-1670
remote: Counting objects: 1050, done.
remote: Total 1050 (delta 392), reused 392 (delta 392), pack-reused 657
Receiving objects: 100% (1050/1050), 195.43 KiB | 189.00 KiB/s, done.
Resolving deltas: 100% (490/490), completed with 153 local objects.
From https://github.com/hyunsik/tajo
* branch TAJO-1670 -> FETCH_HEAD
Removing
tajo-plan/src/main/java/org/apache/tajo/plan/logical/NoSuchColumnException.java
Auto-merging
tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResultResource.java
Auto-merging
tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestQueryResource.java
Auto-merging
tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
CONFLICT (content): Merge conflict in
tajo-core/src/main/java/org/apache/tajo/ws/rs/resources/QueryResource.java
Auto-merging
tajo-common/src/main/java/org/apache/tajo/exception/TajoRuntimeException.java
Auto-merging
tajo-common/src/main/java/org/apache/tajo/exception/TajoInternalError.java
Auto-merging
tajo-common/src/main/java/org/apache/tajo/exception/TajoExceptionInterface.java
Auto-merging
tajo-common/src/main/java/org/apache/tajo/exception/TajoError.java
Auto-merging
tajo-common/src/main/java/org/apache/tajo/exception/InvalidAddressException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/UndefinedTablespaceException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/UndefinedTableException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/UndefinedPartitionException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/UndefinedIndexException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/UndefinedFunctionException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/UndefinedDatabaseException.java
Removing
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/NoSuchPartitionException.java
Removing
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/NoSuchColumnException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/DuplicateTablespaceException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/DuplicateFunctionException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/DuplicateDatabaseException.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/DuplicateColumnException.java
Removing
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/exception/AlreadyExistsTableException.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.
---
