You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/11/07 00:29:49 UTC

[07/22] incubator-slider git commit: Merge branch 'develop' into feature/SLIDER-82-pass-3

Merge branch 'develop' into feature/SLIDER-82-pass-3


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/55d50fe8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/55d50fe8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/55d50fe8

Branch: refs/heads/feature/SLIDER-82-pass-3.1
Commit: 55d50fe87e2deb00aad9775f809f4f694d82cf92
Parents: 5887dde fed5d03
Author: Steve Loughran <st...@apache.org>
Authored: Thu Nov 5 15:24:32 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Nov 5 15:24:32 2015 +0000

----------------------------------------------------------------------
 .../src/main/java/org/apache/slider/client/SliderClient.java    | 4 ++--
 .../apache/slider/providers/agent/TestAgentClientProvider2.java | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/55d50fe8/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------