You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by va...@apache.org on 2017/08/03 06:58:20 UTC
[43/50] [abbrv] hadoop git commit: Addendum for YARN-6102.
Addendum for YARN-6102.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aeecf698
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aeecf698
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aeecf698
Branch: refs/heads/YARN-5355_branch2
Commit: aeecf6985fee9fc59eeb2d7dbc87a81042b40957
Parents: 278ca2f
Author: Varun Saxena <va...@apache.org>
Authored: Fri Jul 28 22:56:05 2017 +0530
Committer: Varun Saxena <va...@apache.org>
Committed: Fri Jul 28 22:56:05 2017 +0530
----------------------------------------------------------------------
.../hadoop/yarn/server/resourcemanager/RMContextImpl.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/aeecf698/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
index ab3672e..c27e1bf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/RMContextImpl.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.ha.HAServiceProtocol;
import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -468,6 +467,11 @@ public class RMContextImpl implements RMContext {
}
@Override
+ public RMTimelineCollectorManager getRMTimelineCollectorManager() {
+ return activeServiceContext.getRMTimelineCollectorManager();
+ }
+
+ @Override
public long getEpoch() {
return activeServiceContext.getEpoch();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org