Repository: hadoop Updated Branches: refs/heads/HDFS-1312 4e664fb02 -> 15df55788
HDFS-9526. Fix jackson annotation imports. Contributed by Xiaobing Zhou Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/15df5578 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/15df5578 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/15df5578 Branch: refs/heads/HDFS-1312 Commit: 15df557884254b61a200af6edc131ffec6781132 Parents: 4e664fb Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Wed Dec 9 12:58:55 2015 -0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Wed Dec 9 12:58:55 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt | 2 ++ .../hdfs/server/diskbalancer/datamodel/DiskBalancerVolume.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/15df5578/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt index cad8e49..952813b 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) http://git-wip-us.apache.org/repos/asf/hadoop/blob/15df5578/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolume.java ---------------------------------------------------------------------- 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 a608248..24e891f 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;
