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/c669b62c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c669b62c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c669b62c Branch: refs/heads/index_support Commit: c669b62cd13a5635d4fa557efb5fc278567997a7 Parents: 561cae6 8741e68 Author: Jihoon Son <[email protected]> Authored: Tue Oct 28 11:20:37 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Tue Oct 28 11:20:37 2014 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../org/apache/tajo/cli/VersionCommand.java | 4 +-- .../java/org/apache/tajo/util/VersionInfo.java | 28 +++++++++++++++----- .../java/org/apache/tajo/master/TajoMaster.java | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
