Merge branch 'master' of http://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/0dc55a88 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/0dc55a88 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/0dc55a88 Branch: refs/heads/index_support Commit: 0dc55a882c8922d0d36cdbb1174e162ec5d97030 Parents: 70de1b4 d652242 Author: Jihoon Son <[email protected]> Authored: Sun Nov 9 18:03:57 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Sun Nov 9 18:03:57 2014 +0900 ---------------------------------------------------------------------- BUILDING | 2 +- CHANGES | 5 +++ README | 2 +- .../cli/tsql/DefaultTajoCliOutputFormatter.java | 6 ++-- .../cli/tsql/commands/DescTableCommand.java | 4 +-- .../org/apache/tajo/client/QueryClient.java | 2 -- .../java/org/apache/tajo/TajoConstants.java | 1 + .../org/apache/tajo/master/GlobalEngine.java | 7 ++-- .../org/apache/tajo/cli/tsql/TestTajoCli.java | 36 ++++++++++++++++++++ .../TestTajoCli/testNonForwardQueryPause.result | 5 +++ .../sphinx/getting_started/prerequisites.rst | 2 +- 11 files changed, 60 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
