Merge branch 'feature/SLIDER-948_Hadoop's_HDFS_split' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/49bf0f1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/49bf0f1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/49bf0f1c Branch: refs/heads/feature/SLIDER-82-anti-affinity-attempt-2 Commit: 49bf0f1cd2e67353b1b1aa3b53e1baf6d390aa07 Parents: 4dda8e8 6c8afed Author: Steve Loughran <ste...@apache.org> Authored: Wed Oct 28 17:14:47 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Wed Oct 28 17:14:47 2015 +0000 ---------------------------------------------------------------------- pom.xml | 30 ++++++++++++++++- slider-core/pom.xml | 8 +++++ .../org/apache/slider/client/SliderClient.java | 8 ++--- .../apache/slider/common/SliderXmlConfKeys.java | 34 ++++++++++++++++++-- .../apache/slider/common/tools/SliderUtils.java | 4 +-- .../slider/core/build/InstanceBuilder.java | 6 ++-- .../server/appmaster/SliderAppMaster.java | 5 ++- .../security/FsDelegationTokenManager.java | 13 ++++---- .../slider/client/TestCommonArgParsing.groovy | 5 ++- .../model/mock/MockContainerStatus.groovy | 3 ++ .../TestFsDelegationTokenManager.groovy | 7 ++-- .../slider/test/YarnMiniClusterTestBase.groovy | 3 +- .../funtest/framework/CommandTestBase.groovy | 2 -- 13 files changed, 93 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/49bf0f1c/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ----------------------------------------------------------------------