Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/daba9fda Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/daba9fda Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/daba9fda Branch: refs/heads/index_support Commit: daba9fdae460c163444f00dfc3a79d2d8d220aa7 Parents: afc2c3e f531495 Author: Jihoon Son <[email protected]> Authored: Sun Oct 12 16:51:05 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Sun Oct 12 16:51:05 2014 +0900 ---------------------------------------------------------------------- CHANGES | 13 ++++++-- pom.xml | 22 ++++++------- tajo-algebra/pom.xml | 7 ++-- tajo-catalog/pom.xml | 8 ++--- tajo-catalog/tajo-catalog-client/pom.xml | 6 ++-- tajo-catalog/tajo-catalog-common/pom.xml | 6 ++-- tajo-catalog/tajo-catalog-drivers/pom.xml | 6 ++-- tajo-catalog/tajo-catalog-server/pom.xml | 8 ++--- tajo-client/pom.xml | 7 ++-- tajo-common/pom.xml | 8 ++--- tajo-core/pom.xml | 5 ++- .../apache/tajo/master/querymaster/Query.java | 2 +- .../tajo/master/querymaster/QueryUnit.java | 12 ++++--- .../tajo/master/querymaster/SubQuery.java | 20 +++++++++++- tajo-dist/pom.xml | 12 +++---- tajo-jdbc/pom.xml | 5 ++- tajo-maven-plugins/pom.xml | 6 ++-- tajo-project/pom.xml | 34 ++++++++++---------- tajo-rpc/pom.xml | 7 ++-- tajo-storage/pom.xml | 8 ++--- tajo-thirdparty/asm/pom.xml | 8 ++--- tajo-yarn-pullserver/pom.xml | 6 ++-- 22 files changed, 109 insertions(+), 107 deletions(-) ----------------------------------------------------------------------
