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 2014/10/14 07:36:46 UTC
git commit: SLIDER-512 Build broken against changes to 2.6.0 YARN
LogAggregationContext
Repository: incubator-slider
Updated Branches:
refs/heads/develop f507a4c04 -> f5ec09556
SLIDER-512 Build broken against changes to 2.6.0 YARN LogAggregationContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f5ec0955
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f5ec0955
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f5ec0955
Branch: refs/heads/develop
Commit: f5ec09556a3bf3dccdd04933a6acd8107a39a6fd
Parents: f507a4c
Author: Gour Saha <go...@apache.org>
Authored: Mon Oct 13 22:36:10 2014 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Mon Oct 13 22:36:10 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/slider/core/launch/AbstractLauncher.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f5ec0955/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java b/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
index 658a03a..0d0f1c6 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
@@ -311,7 +311,8 @@ public abstract class AbstractLauncher extends Configured {
.getOptionInt(ResourceKeys.YARN_LOG_INTERVAL, 0);
log.info("Log interval: {}", logInterval);
logAggregationContext = LogAggregationContext.newInstance(
- logIncludePattern, logExcludePattern, logInterval);
+ logIncludePattern, logExcludePattern);
+ // log interval has been removed from signature - fix required
}
}