Merge branch 'feature/SLIDER-838' 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/95cf1759 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/95cf1759 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/95cf1759 Branch: refs/heads/develop Commit: 95cf1759ee7ca33fd111899c92962a25ee1d26d1 Parents: ebc216a 4e74f3a Author: Steve Loughran <[email protected]> Authored: Thu Apr 2 18:55:12 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Thu Apr 2 18:55:12 2015 +0100 ---------------------------------------------------------------------- .../org/apache/slider/client/SliderClient.java | 12 +++-- .../providers/agent/AgentClientProvider.java | 4 +- .../actions/TestActionInstallPackage.groovy | 5 ++- .../agent/actions/TestActionPackage.groovy | 7 ++- .../agent/TestAgentClientProvider2.java | 47 +++++++++++--------- slider-core/src/test/resources/log4j.properties | 1 + 6 files changed, 47 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
