Github user blrunner commented on the pull request:
https://github.com/apache/tajo/pull/450#issuecomment-87584764
@superpiggy
Could you rebase this? I failed to merge this as following:
```
git pull https://github.com/superpiggy/tajo TAJO-1421
remote: Counting objects: 235, done.
remote: Compressing objects: 100% (50/50), done.
remote: Total 235 (delta 31), reused 19 (delta 19), pack-reused 166
Receiving objects: 100% (235/235), 133.68 KiB | 78.00 KiB/s, done.
Resolving deltas: 100% (38/38), done.
From https://github.com/superpiggy/tajo
* branch TAJO-1421 -> FETCH_HEAD
Auto-merging
tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
Auto-merging tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java
Auto-merging
tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java
Auto-merging
tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLParser.g4
Auto-merging
tajo-core/src/main/antlr4/org/apache/tajo/engine/parser/SQLLexer.g4
Auto-merging
tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
Auto-merging
tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
CONFLICT (content): Merge conflict in
tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
Auto-merging
tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
CONFLICT (content): Merge conflict in
tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
Auto-merging
tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
CONFLICT (content): Merge conflict in
tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
CONFLICT (content): Merge conflict in
tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/AlterTableType.java
CONFLICT (content): Merge conflict in
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/AlterTableType.java
Auto-merging
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/AlterTableDesc.java
CONFLICT (content): Merge conflict in
tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/AlterTableDesc.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.
---
