tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blrun...@apache.org
Subject [10/12] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1027
Date Thu, 11 Sep 2014 02:55:20 GMT
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/e1a94ba5
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e1a94ba5
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e1a94ba5

Branch: refs/heads/TAJO-1027
Commit: e1a94ba55698ec6098bb02bd001209261aecfe31
Parents: 0533754 016507d
Author: Jaehwa Jung <blrunner@apache.org>
Authored: Thu Sep 11 10:51:41 2014 +0900
Committer: Jaehwa Jung <blrunner@apache.org>
Committed: Thu Sep 11 10:51:41 2014 +0900

----------------------------------------------------------------------
 CHANGES                                         |  3 ++
 .../java/org/apache/tajo/worker/TajoWorker.java |  2 +-
 .../org/apache/tajo/TajoTestingCluster.java     |  1 -
 tajo-dist/src/main/bin/tajo-daemon.sh           |  1 +
 tajo-dist/src/main/conf/tajo-env.sh             |  2 +-
 .../apache/tajo/pullserver/TajoPullServer.java  |  2 +-
 .../tajo/pullserver/TajoPullServerService.java  | 51 ++++++++++----------
 7 files changed, 32 insertions(+), 30 deletions(-)
----------------------------------------------------------------------



Mime
View raw message