[34/50] [abbrv] hadoop git commit: HDFS-10871. DiskBalancerWorkItem should not import jackson relocated by htrace. Contributed by Manoj Govindassamy.
HDFS-10871. DiskBalancerWorkItem should not import jackson relocated by htrace. Contributed by Manoj Govindassamy. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d85d9b2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d85d9b2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d85d9b2e Branch: refs/heads/MAPREDUCE-6608 Commit: d85d9b2e7b4df04335111f4e3ce21a2fda39aee9 Parents: d0372dc Author: Anu EngineerAuthored: Thu Sep 22 19:36:16 2016 -0700 Committer: Anu Engineer Committed: Thu Sep 22 19:36:16 2016 -0700 -- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 4 .../hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java | 2 +- .../hadoop/hdfs/server/diskbalancer/planner/MoveStep.java | 6 +- 3 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d85d9b2e/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml -- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index b8b531b..1e38019 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -107,6 +107,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd;> test test-jar + + com.fasterxml.jackson.core + jackson-annotations + http://git-wip-us.apache.org/repos/asf/hadoop/blob/d85d9b2e/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java index 592a89f..909bbd5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java @@ -19,10 +19,10 @@ package org.apache.hadoop.hdfs.server.datanode; +import com.fasterxml.jackson.annotation.JsonInclude; import com.google.common.base.Preconditions; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.apache.htrace.fasterxml.jackson.annotation.JsonInclude; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectReader; http://git-wip-us.apache.org/repos/asf/hadoop/blob/d85d9b2e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java index b5f68fd..7f2f954 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java @@ -17,13 +17,9 @@ package org.apache.hadoop.hdfs.server.diskbalancer.planner; +import com.fasterxml.jackson.annotation.JsonInclude; import org.apache.hadoop.hdfs.server.diskbalancer.datamodel.DiskBalancerVolume; import org.apache.hadoop.util.StringUtils; -import org.apache.htrace.fasterxml.jackson.annotation.JsonInclude; - - - - /** * Ignore fields with default values. In most cases Throughtput, diskErrors - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HDFS-10871. DiskBalancerWorkItem should not import jackson relocated by htrace. Contributed by Manoj Govindassamy.
Repository: hadoop Updated Branches: refs/heads/trunk d0372dc61 -> d85d9b2e7 HDFS-10871. DiskBalancerWorkItem should not import jackson relocated by htrace. Contributed by Manoj Govindassamy. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d85d9b2e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d85d9b2e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d85d9b2e Branch: refs/heads/trunk Commit: d85d9b2e7b4df04335111f4e3ce21a2fda39aee9 Parents: d0372dc Author: Anu EngineerAuthored: Thu Sep 22 19:36:16 2016 -0700 Committer: Anu Engineer Committed: Thu Sep 22 19:36:16 2016 -0700 -- hadoop-hdfs-project/hadoop-hdfs-client/pom.xml | 4 .../hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java | 2 +- .../hadoop/hdfs/server/diskbalancer/planner/MoveStep.java | 6 +- 3 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d85d9b2e/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml -- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml index b8b531b..1e38019 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-client/pom.xml @@ -107,6 +107,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd;> test test-jar + + com.fasterxml.jackson.core + jackson-annotations + http://git-wip-us.apache.org/repos/asf/hadoop/blob/d85d9b2e/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java index 592a89f..909bbd5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancerWorkItem.java @@ -19,10 +19,10 @@ package org.apache.hadoop.hdfs.server.datanode; +import com.fasterxml.jackson.annotation.JsonInclude; import com.google.common.base.Preconditions; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; -import org.apache.htrace.fasterxml.jackson.annotation.JsonInclude; import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectReader; http://git-wip-us.apache.org/repos/asf/hadoop/blob/d85d9b2e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java index b5f68fd..7f2f954 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/diskbalancer/planner/MoveStep.java @@ -17,13 +17,9 @@ package org.apache.hadoop.hdfs.server.diskbalancer.planner; +import com.fasterxml.jackson.annotation.JsonInclude; import org.apache.hadoop.hdfs.server.diskbalancer.datamodel.DiskBalancerVolume; import org.apache.hadoop.util.StringUtils; -import org.apache.htrace.fasterxml.jackson.annotation.JsonInclude; - - - - /** * Ignore fields with default values. In most cases Throughtput, diskErrors - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org