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 2016/10/04 16:25:43 UTC

[16/16] twill git commit: Merge branch 'master' into site

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/f285ac44
Tree: http://git-wip-us.apache.org/repos/asf/twill/tree/f285ac44
Diff: http://git-wip-us.apache.org/repos/asf/twill/diff/f285ac44

Branch: refs/heads/site
Commit: f285ac4439bdb5d50add9f69b5cc22bc974d5dff
Parents: d4a3b6c 983a14a
Author: Terence Yim <ch...@apache.org>
Authored: Tue Oct 4 09:25:18 2016 -0700
Committer: Terence Yim <ch...@apache.org>
Committed: Tue Oct 4 09:25:18 2016 -0700

----------------------------------------------------------------------
 .travis.yml                                     |   1 +
 pom.xml                                         |   2 +-
 twill-api/pom.xml                               |   2 +-
 .../org/apache/twill/api/ServiceAnnouncer.java  |  10 +-
 .../internal/DefaultTwillRunResources.java      |  12 +
 twill-common/pom.xml                            |   2 +-
 .../apache/twill/filesystem/LocalLocation.java  |  98 ++++-
 .../org/apache/twill/filesystem/Location.java   |  41 +-
 twill-core/pom.xml                              |   2 +-
 .../twill/internal/AbstractTwillController.java |  17 +-
 .../twill/internal/AbstractTwillService.java    |   8 +-
 .../twill/internal/BasicTwillContext.java       |  17 +-
 .../java/org/apache/twill/internal/Configs.java |   5 +
 .../twill/internal/DefaultResourceReport.java   |  10 +
 .../twill/internal/ProcessController.java       |   2 +-
 .../twill/internal/TwillContainerLauncher.java  |  65 +++-
 .../internal/kafka/EmbeddedKafkaServer.java     |  42 +-
 twill-discovery-api/pom.xml                     |   2 +-
 .../apache/twill/discovery/Discoverable.java    |  57 ++-
 twill-discovery-core/pom.xml                    |   2 +-
 .../discovery/DefaultServiceDiscovered.java     |  21 +-
 .../twill/discovery/DiscoverableAdapter.java    |  20 +-
 .../twill/discovery/DiscoverableWrapper.java    |  69 ----
 .../discovery/InMemoryDiscoveryService.java     |   7 +-
 .../twill/discovery/ZKDiscoveryService.java     | 174 +++++++--
 .../discovery/DiscoveryServiceTestBase.java     | 383 ++++++++++---------
 .../twill/discovery/ZKDiscoveryServiceTest.java | 114 +++---
 twill-examples/echo/pom.xml                     |   2 +-
 twill-examples/pom.xml                          |   2 +-
 twill-examples/yarn/pom.xml                     |   2 +-
 twill-ext/pom.xml                               |   2 +-
 twill-java8-test/pom.xml                        |   2 +-
 twill-yarn/pom.xml                              |   2 +-
 .../internal/yarn/Hadoop20YarnAppClient.java    |  44 ++-
 .../internal/yarn/Hadoop21YarnAppClient.java    |  42 +-
 .../twill/filesystem/FileContextLocation.java   |  55 ++-
 .../apache/twill/filesystem/HDFSLocation.java   |  71 +++-
 .../appmaster/ApplicationMasterMain.java        |   6 -
 .../appmaster/ApplicationMasterService.java     |  77 ++--
 .../appmaster/RunnableProcessLauncher.java      |   5 +
 .../internal/appmaster/RunningContainers.java   | 167 +++++---
 .../internal/container/TwillContainerMain.java  |  30 +-
 .../twill/internal/yarn/YarnAppClient.java      |   3 +-
 .../apache/twill/internal/yarn/YarnUtils.java   |   2 +-
 .../apache/twill/yarn/YarnTwillController.java  |   2 +-
 .../twill/yarn/YarnTwillRunnerService.java      |   6 +-
 .../twill/filesystem/LocationTestBase.java      |  73 ++++
 .../org/apache/twill/yarn/BaseYarnTest.java     |  20 +
 .../apache/twill/yarn/EchoServerTestRun.java    |  12 +-
 .../twill/yarn/InitializeFailTestRun.java       |  12 +-
 .../org/apache/twill/yarn/LogLevelTestRun.java  |   2 +-
 .../twill/yarn/PlacementPolicyTestRun.java      |  14 +-
 .../twill/yarn/ResourceReportTestRun.java       |   2 +-
 .../twill/yarn/RestartRunnableTestRun.java      | 348 +++++++++++++++++
 .../java/org/apache/twill/yarn/TwillTester.java |  23 +-
 .../org/apache/twill/yarn/YarnTestSuite.java    |   4 +-
 twill-zookeeper/pom.xml                         |   2 +-
 .../internal/zookeeper/LeaderElection.java      |   7 +-
 58 files changed, 1637 insertions(+), 589 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/twill/blob/f285ac44/pom.xml
----------------------------------------------------------------------