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/db292ac7 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/db292ac7 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/db292ac7 Branch: refs/heads/index_support Commit: db292ac7d712802536d1c52084a3b0400b44695d Parents: 12846cc 12f30c5 Author: Jihoon Son <[email protected]> Authored: Wed Mar 25 10:26:59 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Mar 25 10:26:59 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../tajo/engine/codegen/TajoGeneratorAdapter.java | 6 ------ .../reporter/MetricsFileScheduledReporter.java | 5 +++-- .../apache/tajo/engine/query/TestSelectQuery.java | 17 +++++++++++++---- .../TestSelectQuery/testExplainSelect.result | 2 +- 5 files changed, 19 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
