tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blrun...@apache.org
Subject [11/12] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Date Thu, 11 Sep 2014 02:55:21 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/05c89244
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/05c89244
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/05c89244

Branch: refs/heads/TAJO-1027
Commit: 05c892448113db40daef54d2e06dad463dbae9c8
Parents: b33a945 604eb32
Author: Jaehwa Jung <blrunner@apache.org>
Authored: Thu Sep 11 11:33:54 2014 +0900
Committer: Jaehwa Jung <blrunner@apache.org>
Committed: Thu Sep 11 11:33:54 2014 +0900

----------------------------------------------------------------------
 CHANGES                                         | 13 +++
 .../main/java/org/apache/tajo/cli/TajoCli.java  | 23 +++--
 .../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/worker/TajoWorker.java |  2 +-
 .../org/apache/tajo/TajoTestingCluster.java     |  1 -
 .../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 95 +++++++++++++++++++-
 tajo-dist/src/main/bin/tajo-daemon.sh           |  1 +
 tajo-dist/src/main/conf/tajo-env.sh             |  2 +-
 .../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 +++++++++++++++-
 .../apache/tajo/pullserver/TajoPullServer.java  |  2 +-
 .../tajo/pullserver/TajoPullServerService.java  | 51 ++++++-----
 18 files changed, 249 insertions(+), 64 deletions(-)
----------------------------------------------------------------------



Mime
View raw message