浏览代码

HDFS-9611. DiskBalancer : Replace htrace json imports with jackson. (Contributed by Anu Engineer)

Arpit Agarwal 9 年之前
父节点
当前提交
e325c6ade9

+ 4 - 0
hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt

@@ -7,3 +7,7 @@ HDFS-1312 Change Log
     HDFS-9449. DiskBalancer: Add connectors. (Anu Engineer via szetszwo)
 
     HDFS-9526. Fix jackson annotation imports. (Xiaobing Zhou via szetszwo)
+
+    HDFS-9611. DiskBalancer : Replace htrace json imports with jackson.
+    (Anu Engineer via Arpit Agarwal)
+

+ 2 - 2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolumeSet.java

@@ -21,8 +21,8 @@ package org.apache.hadoop.hdfs.server.diskbalancer.datamodel;
 import com.google.common.base.Preconditions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.htrace.fasterxml.jackson.annotation.JsonIgnore;
-import org.apache.htrace.fasterxml.jackson.annotation.JsonProperty;
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonProperty;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
 import java.io.Serializable;