This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new ad27343 Revert "HBASE-21988 Remove hadoop2.6.1-hadoop-2.6.4 as
supported on branch-2.0"
ad27343 is described below
commit ad27343b4eaeb94794506ccb4f51758bbe1428ca
Author: stack <[email protected]>
AuthorDate: Mon Mar 4 12:55:20 2019 -0800
Revert "HBASE-21988 Remove hadoop2.6.1-hadoop-2.6.4 as supported on
branch-2.0"
This reverts commit 6e862c2c6098371da50215f761ee514e26e4fd53.
Mistakenly pushed to branch-2.0. Revert.
---
dev-support/hbase-personality.sh | 2 +-
src/main/asciidoc/_chapters/configuration.adoc | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index aff386c..ba5bc37 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -488,7 +488,7 @@ function hadoopcheck_rebuild
# All supported Hadoop versions that we want to test the compilation with
# See the Hadoop section on prereqs in the HBase Reference Guide
- hbase_common_hadoop2_versions="2.6.5 2.7.1 2.7.2 2.7.3 2.7.4"
+ hbase_common_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2
2.7.3 2.7.4"
if [[ "${PATCH_BRANCH}" = branch-1* ]]; then
yetus_info "Setting Hadoop versions to test based on branch-1-ish rules."
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
diff --git a/src/main/asciidoc/_chapters/configuration.adoc
b/src/main/asciidoc/_chapters/configuration.adoc
index bdbaafb..6980a26 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -223,8 +223,7 @@ Use the following legend to interpret this table:
|Hadoop-2.4.x | S | S | X | X | X
|Hadoop-2.5.x | S | S | X | X | X
|Hadoop-2.6.0 | X | X | X | X | X
-|Hadoop-2.6.1+ | S | S | X | X | X
-|Hadoop-2.6.5+ | S | S | X | S | X
+|Hadoop-2.6.1+ | S | S | X | S | X
|Hadoop-2.7.0 | X | X | X | X | X
|Hadoop-2.7.1+ | S | S | S | S | S
|Hadoop-2.8.[0-1] | X | X | X | X | X