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 2016/05/24 17:01:26 UTC
[5/5] incubator-slider git commit: Merge branch
'feature/SLIDER-1129-httpclient' into develop
Merge branch 'feature/SLIDER-1129-httpclient' 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/44f4a545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/44f4a545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/44f4a545
Branch: refs/heads/develop
Commit: 44f4a5457a075a4315ae9a247daac5cadcb759cd
Parents: 5c391cc 80fe8c7
Author: Steve Loughran <st...@apache.org>
Authored: Tue May 24 18:00:09 2016 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue May 24 18:00:09 2016 +0100
----------------------------------------------------------------------
pom.xml | 32 ++-------
slider-core/pom.xml | 8 +--
.../appmaster/state/OutstandingRequest.java | 2 +
.../appstate/TestMockAppStateAAPlacement.groovy | 8 +--
.../appstate/TestMockLabelledAAPlacement.groovy | 11 +--
.../TestOutstandingRequestValidation.groovy | 26 -------
.../model/history/TestRoleHistoryAA.groovy | 12 ++--
...tRoleHistoryOutstandingRequestTracker.groovy | 5 +-
.../model/mock/MockContainerStatus.groovy | 34 ---------
.../appmaster/model/mock/MockFactory.groovy | 60 +++++++++++++++-
.../appmaster/model/mock/MockNodeReport.groovy | 75 --------------------
.../model/mock/MockRecordFactory.groovy | 37 ++++++++++
.../appmaster/model/mock/MockYarnCluster.groovy | 9 ++-
.../appmaster/model/mock/MockYarnEngine.groovy | 5 +-
14 files changed, 131 insertions(+), 193 deletions(-)
----------------------------------------------------------------------