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/03/26 19:01:59 UTC
[4/4] incubator-slider git commit: Merge branch
'feature/SLIDER-832_Jenkins_failing_after_SLIDER-799_merge' into develop
Merge branch 'feature/SLIDER-832_Jenkins_failing_after_SLIDER-799_merge' 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/f5f837cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f5f837cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f5f837cc
Branch: refs/heads/develop
Commit: f5f837cc74d008becac2a663c13753e65e8a32b8
Parents: 63e2b80 14b90b3
Author: Steve Loughran <st...@apache.org>
Authored: Thu Mar 26 15:12:55 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Mar 26 15:12:55 2015 +0000
----------------------------------------------------------------------
.../server/appmaster/state/RoleHistory.java | 26 ++++----
...tRoleHistoryOutstandingRequestTracker.groovy | 31 ----------
.../TestRoleHistoryRequestTracking.groovy | 64 ++++++++++++++++----
.../model/mock/BaseMockAppStateTest.groovy | 17 +++++-
.../appmaster/model/mock/MockFactory.groovy | 2 +-
5 files changed, 85 insertions(+), 55 deletions(-)
----------------------------------------------------------------------