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/30315e85 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/30315e85 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/30315e85 Branch: refs/heads/index_support Commit: 30315e856b6d5c3b7f43b6d1949246136acf5d5e Parents: 9d59156 fa20b65 Author: Jihoon Son <[email protected]> Authored: Tue Feb 24 11:34:00 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Feb 24 11:34:00 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 + .../org/apache/tajo/master/QueryInProgress.java | 70 +++++++++++++------- .../org/apache/tajo/master/QueryManager.java | 8 +-- .../apache/tajo/querymaster/QueryJobEvent.java | 1 - 4 files changed, 48 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
