Merge branch 'feature/feature/SLIDER-377' 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/a0a3ae63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a0a3ae63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a0a3ae63 Branch: refs/heads/develop Commit: a0a3ae632fc34be0137ac71b1564ca319c757632 Parents: 88d72dd 4fc0396 Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 4 18:19:08 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 4 18:19:08 2014 +0100 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 6 ++- .../agent/actions/TestActionVersion.groovy | 5 +-- .../tools/TestClientResourceRegistration.groovy | 3 ++ .../common/tools/TestConfigHelperHDFS.groovy | 3 ++ .../common/tools/TestMiscSliderUtils.groovy | 3 ++ .../common/tools/TestZKIntegration.groovy | 44 ++++++++++---------- .../slider/providers/agent/AgentTestBase.groovy | 2 +- .../slider/test/YarnMiniClusterTestBase.groovy | 27 ++++++------ 8 files changed, 52 insertions(+), 41 deletions(-) ----------------------------------------------------------------------
