Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into TAJO-1730
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/faf12b19 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/faf12b19 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/faf12b19 Branch: refs/heads/TAJO-1730 Commit: faf12b194b69d9e1dc5bbed6417ed2b4af6b41d5 Parents: bf15ce7 f21d5d6 Author: Hyunsik Choi <[email protected]> Authored: Sat Aug 22 00:09:54 2015 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Sat Aug 22 00:09:54 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 + .../org/apache/tajo/master/QueryManager.java | 3 +- .../src/main/resources/python/controller.py | 3 - .../function/python/PythonScriptEngine.java | 97 ++++++++++++++------ 4 files changed, 75 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
