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 <[email protected]> Authored: Thu Sep 11 10:51:41 2014 +0900 Committer: Jaehwa Jung <[email protected]> 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(-) ----------------------------------------------------------------------
