Pārlūkot izejas kodu

MAPREDUCE-3336. Replaced guice internal.Preconditions api usage with the public Preconditions API. Contributed by Thomas Graves.
svn merge -c r1199714 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199716 13f79535-47bb-0310-9956-ffa450edef68

Vinod Kumar Vavilapalli 13 gadi atpakaļ
vecāks
revīzija
e430e1a921

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -15,6 +15,9 @@ Release 0.23.1 - Unreleased
     HistoryServer and clients can use them without depending on the
     yarn-server-nodemanager module. (Siddharth Seth via vinodkv)
 
+    MAPREDUCE-3336. Replaced guice internal.Preconditions api usage with the
+    public Preconditions API. (Thomas Graves via vinodkv)
+
   OPTIMIZATIONS
 
   BUG FIXES

+ 1 - 1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/ContainersMonitorImpl.java

@@ -40,7 +40,7 @@ import org.apache.hadoop.yarn.service.AbstractService;
 import org.apache.hadoop.yarn.util.ProcfsBasedProcessTree;
 import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin;
 
-import com.google.inject.internal.Preconditions;
+import com.google.common.base.Preconditions;
 
 public class ContainersMonitorImpl extends AbstractService implements
     ContainersMonitor {