Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Conflicts:
slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4cbc9fe7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4cbc9fe7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4cbc9fe7
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: 4cbc9fe7f6666e8f047c92a5a40062ef1f5ebe36
Parents: 9708292 c91d5ec
Author: Steve Loughran <ste...@apache.org>
Authored: Fri Aug 29 15:54:56 2014 +0100
Committer: Steve Loughran <ste...@apache.org>
Committed: Fri Aug 29 15:54:56 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
.../funtest/accumulo/AccumuloSSLTestBase.groovy | 28 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/memcached/appConfig.json | 2 -
.../src/test/python/agent/TestRegistration.py | 14 +-
slider-agent/src/test/python/unitTests.py | 1 +
.../apache/slider/common/tools/SliderUtils.java | 55 ++--
.../server/appmaster/SliderAppMaster.java | 94 ++++---
.../appmaster/actions/RenewingAction.java | 36 ++-
.../appmaster/monkey/ChaosMonkeyService.java | 4 +-
.../security/FsDelegationTokenManager.java | 257 +++++++++++++++++++
.../agent/AgentMiniClusterTestBase.groovy | 2 +-
.../TestStandaloneAMMonkeyRestart.groovy | 4 -
.../agent/TestAgentAMManagementWS.groovy | 8 +-
.../slider/providers/agent/TestAgentEcho.groovy | 6 +-
.../curator/TestRegistryRestResources.groovy | 6 +-
.../publisher/TestPublisherRestResources.groovy | 26 +-
.../TestFsDelegationTokenManager.groovy | 244 ++++++++++++++++++
.../apache/slider/test/SliderTestUtils.groovy | 9 +
.../workflow/ProcessCommandFactory.java | 21 +-
.../services/workflow/TestLongLivedProcess.java | 6 +-
.../workflow/WorkflowServiceTestBase.java | 3 +-
22 files changed, 696 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4cbc9fe7/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --cc
slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 6bd67d2,51c3b93..a2545ab
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@@ -363,7 -350,7 +364,8 @@@ public class SliderAppMaster extends Ab
private final QueueService actionQueues = new QueueService();
private String agentOpsUrl;
private String agentStatusUrl;
+ private YarnRegistryViewForProviders yarnRegistryOperations;
+ private FsDelegationTokenManager fsDelegationTokenManager;
/**
* Service Constructor
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4cbc9fe7/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
