You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2016/03/16 21:58:01 UTC
[10/50] incubator-slider git commit: Merge branch
'feature/SLIDER-1052_Deadlock_in_slider_AM' into develop
Merge branch 'feature/SLIDER-1052_Deadlock_in_slider_AM' 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/52379014
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/52379014
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/52379014
Branch: refs/heads/feature/SLIDER-906_docker_support
Commit: 523790145400c8cdcad31ad91c6f7096daae0188
Parents: 4465740 136013b
Author: Steve Loughran <st...@apache.org>
Authored: Sun Jan 17 19:48:39 2016 -0800
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Jan 17 19:48:39 2016 -0800
----------------------------------------------------------------------
.../slider/server/appmaster/SliderAppMaster.java | 2 +-
.../services/workflow/WorkflowCompositeService.java | 16 ++++++++++++++++
.../slider/common/tools/TestZKIntegration.groovy | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------