You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2016/04/13 08:13:10 UTC
[8/8] incubator-slider git commit: Merge branch 'develop' into
feature/SLIDER-906_docker_support
Merge branch 'develop' into feature/SLIDER-906_docker_support
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/70ed223f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/70ed223f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/70ed223f
Branch: refs/heads/feature/SLIDER-906_docker_support
Commit: 70ed223fc63550b0a3c4d1aa455c83696327dd8b
Parents: fffd4e6 4b4e24f
Author: Gour Saha <go...@apache.org>
Authored: Tue Apr 12 23:11:37 2016 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Tue Apr 12 23:11:37 2016 -0700
----------------------------------------------------------------------
app-packages/kafka/README.md | 27 ++--
app-packages/kafka/pom.xml | 158 +++++++++----------
.../kafka/src/assembly/koya-app-package.xml | 4 +-
.../org/apache/slider/client/SliderClient.java | 33 ++++
.../slider/client/rest/RestClientFactory.java | 2 +-
.../apache/slider/common/tools/SliderUtils.java | 13 +-
.../slider/core/main/ServiceLauncher.java | 6 +-
.../slider/providers/agent/AgentUtils.java | 60 +++++--
.../metadata/AbstractMetainfoParser.java | 4 +-
.../server/appmaster/SliderAppMaster.java | 6 +-
.../appmaster/web/rest/agent/AgentWebApp.java | 19 ++-
.../slider/providers/agent/TestAgentUtils.java | 94 +++++++++++
.../web/rest/agent/TestAMAgentWebServices.java | 19 +++
13 files changed, 326 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/70ed223f/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/70ed223f/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/70ed223f/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------