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 zj...@apache.org on 2015/07/27 22:08:32 UTC
[50/50] [abbrv] hadoop git commit: Fixed the compilation failure
caused by YARN-3925.
Fixed the compilation failure caused by YARN-3925.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a7153ade
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a7153ade
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a7153ade
Branch: refs/heads/YARN-2928
Commit: a7153ade70fe90d65d5aa7bac249a54493ec71d4
Parents: c6f119d
Author: Zhijie Shen <zj...@apache.org>
Authored: Mon Jul 27 13:06:31 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Mon Jul 27 13:06:31 2015 -0700
----------------------------------------------------------------------
.../yarn/server/nodemanager/webapp/TestContainerLogsPage.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7153ade/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java
index 30f7984..524364d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/webapp/TestContainerLogsPage.java
@@ -158,7 +158,7 @@ public class TestContainerLogsPage {
LocalDirsHandlerService dirsHandler = new LocalDirsHandlerService();
dirsHandler.init(conf);
NMContext nmContext = new NodeManager.NMContext(null, null, dirsHandler,
- new ApplicationACLsManager(conf), new NMNullStateStoreService());
+ new ApplicationACLsManager(conf), new NMNullStateStoreService(), conf);
// Add an application and the corresponding containers
String user = "nobody";
long clusterTimeStamp = 1234;