Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1027
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/05337542 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/05337542 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/05337542 Branch: refs/heads/TAJO-1027 Commit: 05337542264d428618082036d567e97e608920c2 Parents: fca2e74 0f76a8b Author: Jaehwa Jung <[email protected]> Authored: Thu Sep 11 10:27:53 2014 +0900 Committer: Jaehwa Jung <[email protected]> Committed: Thu Sep 11 10:27:53 2014 +0900 ---------------------------------------------------------------------- CHANGES | 8 ++ .../org/apache/tajo/cli/VersionCommand.java | 4 +- .../org/apache/tajo/jdbc/TajoResultSet.java | 2 +- .../java/org/apache/tajo/TajoConstants.java | 1 - .../java/org/apache/tajo/conf/TajoConf.java | 8 +- .../java/org/apache/tajo/master/TajoMaster.java | 4 +- .../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 95 +++++++++++++++++++- .../org/apache/tajo/jdbc/TajoConnection.java | 8 +- .../apache/tajo/jdbc/TajoDatabaseMetaData.java | 4 +- .../apache/tajo/jdbc/TajoPreparedStatement.java | 16 +++- .../org/apache/tajo/jdbc/TajoStatement.java | 76 +++++++++++++++- 11 files changed, 200 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
