HDFS-9611. DiskBalancer : Replace htrace json imports with jackson. (Contributed by Anu Engineer)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e325c6ad Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e325c6ad Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e325c6ad Branch: refs/heads/trunk Commit: e325c6ade9dab41e0fbbf5222bb72236d4d5a77f Parents: 599eca0 Author: Arpit Agarwal <[email protected]> Authored: Tue Jan 5 09:10:03 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Thu Jun 23 18:18:48 2016 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/HDFS-1312_CHANGES.txt | 4 ++++ .../server/diskbalancer/datamodel/DiskBalancerVolumeSet.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e325c6ad/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 952813b..8220f88 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) + http://git-wip-us.apache.org/repos/asf/hadoop/blob/e325c6ad/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/datamodel/DiskBalancerVolumeSet.java ---------------------------------------------------------------------- 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 15c21ac..49c8558 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 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
