Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/79c1dcf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/79c1dcf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/79c1dcf1 Branch: refs/heads/site Commit: 79c1dcf11a401bec824a93d74ba2697dae04b3ad Parents: 2bd71bb bb0212d Author: Terence Yim <[email protected]> Authored: Thu Jul 30 13:05:46 2015 -0700 Committer: Terence Yim <[email protected]> Committed: Thu Jul 30 13:05:46 2015 -0700 ---------------------------------------------------------------------- .../ApplicationMasterProcessLauncher.java | 5 -- .../appmaster/ApplicationMasterService.java | 82 ++++++++++++++------ .../appmaster/RunnableContainerRequest.java | 16 ++++ .../internal/container/TwillContainerMain.java | 13 ---- .../yarn/AbstractYarnProcessLauncher.java | 20 +---- 5 files changed, 77 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
