You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@twill.apache.org by ch...@apache.org on 2015/02/27 22:15:40 UTC
[13/13] incubator-twill git commit: Merge branch 'master' into site
Merge branch 'master' into site
Conflicts:
twill-core/src/main/java/org/apache/twill/internal/TwillContainerLauncher.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/530710d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/530710d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/530710d7
Branch: refs/heads/site
Commit: 530710d70e06eac631b443703e213d5f26e6a1b2
Parents: 4e24fd6 3ab373d
Author: Terence Yim <ch...@apache.org>
Authored: Fri Feb 27 12:57:52 2015 -0800
Committer: Terence Yim <ch...@apache.org>
Committed: Fri Feb 27 12:57:52 2015 -0800
----------------------------------------------------------------------
NOTICE | 2 +-
pom.xml | 4 +-
twill-api/pom.xml | 2 +-
.../java/org/apache/twill/api/TwillContext.java | 10 +
.../org/apache/twill/api/TwillPreparer.java | 8 +
twill-common/pom.xml | 2 +-
twill-core/pom.xml | 2 +-
.../twill/internal/BasicTwillContext.java | 18 +-
.../apache/twill/internal/ProcessLauncher.java | 70 +--
.../twill/internal/TwillContainerLauncher.java | 43 +-
twill-discovery-api/pom.xml | 2 +-
twill-discovery-core/pom.xml | 2 +-
twill-examples/echo/pom.xml | 2 +-
twill-examples/pom.xml | 2 +-
twill-examples/yarn/pom.xml | 2 +-
twill-ext/pom.xml | 2 +-
twill-yarn/pom.xml | 2 +-
.../internal/yarn/Hadoop20YarnAppClient.java | 14 +-
.../internal/yarn/Hadoop21YarnAppClient.java | 14 +-
.../internal/container/TwillContainerMain.java | 10 +-
.../yarn/AbstractYarnProcessLauncher.java | 124 ++---
.../twill/internal/yarn/YarnAppClient.java | 17 +-
.../apache/twill/yarn/YarnTwillPreparer.java | 16 +-
twill-zookeeper/pom.xml | 2 +-
.../zookeeper/DefaultZKClientService.java | 21 +-
.../internal/zookeeper/NamespaceZKClient.java | 5 +-
.../zookeeper/ReentrantDistributedLock.java | 419 ++++++++++++++++
.../twill/zookeeper/ForwardingZKClient.java | 5 +-
.../org/apache/twill/zookeeper/ZKClient.java | 4 +-
.../twill/zookeeper/ZKClientServices.java | 5 +-
.../zookeeper/ReentrantDistributedLockTest.java | 484 +++++++++++++++++++
31 files changed, 1101 insertions(+), 214 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/530710d7/pom.xml
----------------------------------------------------------------------