Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/twill/repo Commit: http://git-wip-us.apache.org/repos/asf/twill/commit/b99b2627 Tree: http://git-wip-us.apache.org/repos/asf/twill/tree/b99b2627 Diff: http://git-wip-us.apache.org/repos/asf/twill/diff/b99b2627 Branch: refs/heads/site Commit: b99b2627832f411dad183209c4dc237268989751 Parents: 105f0d6 6837f15 Author: Terence Yim <cht...@apache.org> Authored: Thu Oct 13 09:50:12 2016 -0700 Committer: Terence Yim <cht...@apache.org> Committed: Thu Oct 13 09:50:12 2016 -0700 ---------------------------------------------------------------------- pom.xml | 8 + .../org/apache/twill/internal/Constants.java | 4 + .../java/org/apache/twill/internal/EnvKeys.java | 13 +- .../twill/internal/TwillContainerLauncher.java | 2 +- .../internal/TwillRuntimeSpecification.java | 96 +++++++++++ .../json/TwillRuntimeSpecificationAdapter.java | 163 +++++++++++++++++++ .../json/TwillRuntimeSpecificationCodec.java | 91 +++++++++++ .../json/TwillSpecificationAdapter.java | 161 ------------------ .../org/apache/twill/internal/ServiceMain.java | 9 +- .../appmaster/ApplicationMasterMain.java | 21 +-- .../appmaster/ApplicationMasterService.java | 40 ++--- .../internal/appmaster/RunningContainers.java | 10 +- .../internal/container/TwillContainerMain.java | 31 ++-- .../apache/twill/yarn/YarnTwillPreparer.java | 27 ++- 14 files changed, 423 insertions(+), 253 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/twill/blob/b99b2627/pom.xml ----------------------------------------------------------------------
