Repository: hbase Updated Branches: refs/heads/branch-2 71a4c17d9 -> 584093c23
Revert "HBASE-20538 Upgrade our hadoop-two.version to 2.7.7 and 3.0.3" This reverts commit 71a4c17d99350a542c7116dd8e3ad565de5180ae. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5957fced Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5957fced Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5957fced Branch: refs/heads/branch-2 Commit: 5957fceda40002b30499b1b86dea1b864e649711 Parents: 71a4c17 Author: zhangduo <zhang...@apache.org> Authored: Sun Jul 29 20:19:16 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Sun Jul 29 20:19:16 2018 +0800 ---------------------------------------------------------------------- .../hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java | 2 ++ pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/5957fced/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java index a221a01..09b1d56 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestSaslFanOutOneBlockAsyncDFSOutput.java @@ -63,6 +63,7 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; import org.junit.runner.RunWith; @@ -78,6 +79,7 @@ import org.apache.hbase.thirdparty.io.netty.channel.socket.nio.NioSocketChannel; @RunWith(Parameterized.class) @Category({ MiscTests.class, LargeTests.class }) +@Ignore public class TestSaslFanOutOneBlockAsyncDFSOutput { @ClassRule http://git-wip-us.apache.org/repos/asf/hbase/blob/5957fced/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 10101b0..caa3901 100755 --- a/pom.xml +++ b/pom.xml @@ -1321,8 +1321,8 @@ <maven.min.version>3.0.4</maven.min.version> <java.min.version>${compileSource}</java.min.version> <!-- Dependencies --> - <hadoop-two.version>2.7.7</hadoop-two.version> - <hadoop-three.version>3.0.3</hadoop-three.version> + <hadoop-two.version>2.7.4</hadoop-two.version> + <hadoop-three.version>3.0.0</hadoop-three.version> <!-- These must be defined here for downstream build tools that don't look at profiles. They ought to match the values found in our default hadoop profile, which is currently "hadoop-2.0". See HBASE-15925 for more info. -->
