Merge branch 'feature/SLIDER-509-registry-funtests' 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/97835815 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/97835815 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/97835815 Branch: refs/heads/develop Commit: 97835815c13f6711c1b00aea8f1f55c309910288 Parents: baa79a7 c6c5955 Author: Steve Loughran <[email protected]> Authored: Tue Oct 14 17:37:49 2014 -0700 Committer: Steve Loughran <[email protected]> Committed: Tue Oct 14 17:37:49 2014 -0700 ---------------------------------------------------------------------- slider-assembly/src/conf/log4j.properties | 2 + .../org/apache/slider/client/SliderClient.java | 114 ++++++++++++++----- .../apache/slider/client/SliderClientAPI.java | 4 - .../common/params/ActionDiagnosticArgs.java | 7 +- .../slider/common/params/ActionResolveArgs.java | 1 - .../apache/slider/common/params/Arguments.java | 32 +++--- .../apache/slider/common/params/ClientArgs.java | 2 +- .../slider/common/tools/ConfigHelper.java | 2 +- .../core/registry/SliderRegistryUtils.java | 62 ++++++++++ .../server/appmaster/SliderAppMaster.java | 6 +- .../TestStandaloneYarnRegistryAM.groovy | 9 ++ .../apache/slider/client/TestDiagnostics.groovy | 58 ++++++++++ .../slider/registry/TestRegistryPaths.groovy | 17 ++- .../framework/AgentCommandTestBase.groovy | 7 +- .../funtest/framework/CommandTestBase.groovy | 24 +++- .../funtest/framework/FuntestProperties.groovy | 6 + .../slider/funtest/framework/SliderShell.groovy | 23 +++- .../commands/DiagnosticsCommandIT.groovy | 47 ++++++++ .../lifecycle/AgentClusterLifecycleIT.groovy | 2 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 3 +- 20 files changed, 360 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
