Merge branch 'crunch-307'
Project: http://git-wip-us.apache.org/repos/asf/crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/crunch/commit/10bf7048 Tree: http://git-wip-us.apache.org/repos/asf/crunch/tree/10bf7048 Diff: http://git-wip-us.apache.org/repos/asf/crunch/diff/10bf7048 Branch: refs/heads/master Commit: 10bf70489b6ad132acc09085bc05d17cfefe5e73 Parents: 23bad11 96e3945 Author: Chao Shi <[email protected]> Authored: Wed Dec 4 22:26:13 2013 +0800 Committer: Chao Shi <[email protected]> Committed: Wed Dec 4 22:26:13 2013 +0800 ---------------------------------------------------------------------- .../lib/jobcontrol/CrunchJobControl.java | 14 +++- .../apache/crunch/impl/mr/exec/MRExecutor.java | 7 +- .../apache/crunch/impl/mr/plan/MSCRPlanner.java | 2 +- .../crunch/impl/mr/run/RuntimeParameters.java | 2 + .../lib/jobcontrol/CrunchJobControlTest.java | 77 ++++++++++++++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
