Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/7f7bb5b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/7f7bb5b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/7f7bb5b8 Branch: refs/heads/develop Commit: 7f7bb5b832a09d3420cc8a3c801b50a5f923e2b5 Parents: bfbc67a 0419a5a Author: Steve Loughran <ste...@apache.org> Authored: Tue Oct 7 15:18:04 2014 -0700 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Oct 7 15:18:04 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/appConfig-default.json | 2 +- app-packages/accumulo/pom.xml | 1 + pom.xml | 6 + slider-agent/conf/agent.ini | 1 + .../src/main/python/agent/AgentConfig.py | 14 ++ .../src/main/python/agent/Controller.py | 35 +++- .../src/test/python/agent/TestController.py | 63 ++++++ slider-agent/src/test/python/agent/TestMain.py | 37 ++++ .../org/apache/slider/common/SliderKeys.java | 4 + .../slider/common/tools/CoreFileSystem.java | 15 ++ .../providers/agent/AgentProviderService.java | 27 +++ .../server/appmaster/SliderAppMaster.java | 161 ++++++++++----- .../security/SecurityConfiguration.java | 201 +++++++++++++++++++ .../security/SecurityConfigurationTest.groovy | 159 +++++++++++++++ .../AppsThroughAgentQueueAndLabelsIT.groovy | 26 +++ 15 files changed, 702 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f7bb5b8/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f7bb5b8/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/7f7bb5b8/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ----------------------------------------------------------------------