From e325c6ade9dab41e0fbbf5222bb72236d4d5a77f Mon Sep 17 00:00:00 2001 From: Arpit Agarwal Date: Tue, 5 Jan 2016 09:10:03 -0800 Subject: [PATCH] HDFS-9611. DiskBalancer : Replace htrace json imports with jackson. (Contributed by Anu Engineer) --- hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt | 4 ++++ .../server/diskbalancer/datamodel/DiskBalancerVolumeSet.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt index 952813b98d..8220f8890f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt +++ b/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) + diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolumeSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolumeSet.java index 15c21ac0b6..49c85584da 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolumeSet.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolumeSet.java @@ -21,8 +21,8 @@ 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;