Merge commit '7c95d5b059045cc01fa9756308f50e01644abb2d' 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/4eeed33a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4eeed33a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4eeed33a Branch: refs/heads/develop Commit: 4eeed33abd8623c094ea771e1d6cd2875c15c1fd Parents: f6bbb8b 7c95d5b Author: Steve Loughran <ste...@apache.org> Authored: Thu Sep 11 10:37:11 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Sep 11 10:37:11 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/slider/client/SliderClient.java | 13 ++++++------- .../org/apache/slider/common/tools/SliderUtils.java | 4 +++- .../abstracttests/AbstractTestBuildSetup.groovy | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4eeed33a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ----------------------------------------------------------------------