Author: omalley
Date: Tue Mar 8 06:00:28 2011
New Revision: 1079251
URL: http://svn.apache.org/viewvc?rev=1079251&view=rev
Log:
commit 5448a75eaf4c37e0286ef2d943e5fcb012bbb266
Author: Greg Roelofs <[email protected]>
Date: Wed Jan 19 17:35:43 2011 -0800
Argh, missed one small diff in one file (overlooked amongst debug noise).
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/TaskTracker.java
Modified:
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/TaskTracker.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=1079251&r1=1079250&r2=1079251&view=diff
==============================================================================
---
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/TaskTracker.java
(original)
+++
hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapred/TaskTracker.java
Tue Mar 8 06:00:28 2011
@@ -3941,7 +3941,7 @@ public class TaskTracker
}
reservedPhysicalMemoryOnTT =
- fConf.getLong(TTConfig.TT_RESERVED_PHYSCIALMEMORY_MB,
+ fConf.getLong(TTConfig.TT_RESERVED_PHYSICALMEMORY_MB,
JobConf.DISABLED_MEMORY_LIMIT);
reservedPhysicalMemoryOnTT =
reservedPhysicalMemoryOnTT == JobConf.DISABLED_MEMORY_LIMIT ?
