Merge branch 
'feature/SLIDER-1156_OutstandingRequestTracker_edits_map_while_iterating_over_it's_entries'
 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/de725c24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/de725c24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/de725c24

Branch: refs/heads/develop
Commit: de725c2407d822c93028f1fbae088337cbe10688
Parents: cfa66ca 8e80ed1
Author: Steve Loughran <ste...@apache.org>
Authored: Mon Jul 18 10:35:46 2016 +0100
Committer: Steve Loughran <ste...@apache.org>
Committed: Mon Jul 18 10:35:46 2016 +0100

----------------------------------------------------------------------
 .../server/appmaster/state/OutstandingRequestTracker.java     | 7 ++++++-
 .../org/apache/slider/test/YarnMiniClusterTestBase.groovy     | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


Reply via email to