From 599eca07b422d8dbf015ed01a5d5a13e4488468c Mon Sep 17 00:00:00 2001 From: Tsz-Wo Nicholas Sze Date: Wed, 9 Dec 2015 12:58:55 -0800 Subject: [PATCH] HDFS-9526. Fix jackson annotation imports. Contributed by Xiaobing Zhou --- hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt | 2 ++ .../server/diskbalancer/datamodel/DiskBalancerVolume.java | 5 +++-- 2 files changed, 5 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 cad8e490b5..952813b98d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt @@ -5,3 +5,5 @@ HDFS-1312 Change Log HDFS-9420. Add DataModels for DiskBalancer. (Anu Engineer via szetszwo) HDFS-9449. DiskBalancer: Add connectors. (Anu Engineer via szetszwo) + + HDFS-9526. Fix jackson annotation imports. (Xiaobing Zhou via szetszwo) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolume.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolume.java index a608248d8a..24e891fdde 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolume.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolume.java @@ -18,8 +18,9 @@ package org.apache.hadoop.hdfs.server.diskbalancer.datamodel; import com.google.common.base.Preconditions; -import org.apache.htrace.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.htrace.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import org.codehaus.jackson.annotate.JsonIgnore; +import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.map.ObjectMapper; import java.io.IOException;