Repository: hbase
Updated Branches:
  refs/heads/branch-2 9719fe828 -> e9ea19fba


HBASE-18653 Undo hbase2 check against < hadoop2.6.x; i.e. implement agreed drop 
of hadoop 2.4 and 2.5 support in hbase2


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e9ea19fb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e9ea19fb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e9ea19fb

Branch: refs/heads/branch-2
Commit: e9ea19fba6b609127dd472c6d0694972e26b6517
Parents: 9719fe8
Author: Michael Stack <st...@apache.org>
Authored: Tue Aug 22 09:45:43 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Tue Aug 22 09:45:43 2017 -0700

----------------------------------------------------------------------
 dev-support/hbase-personality.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e9ea19fb/dev-support/hbase-personality.sh
----------------------------------------------------------------------
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 6aa95f9..37a4144 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -53,9 +53,14 @@ function personality_globals
 
   # TODO use PATCH_BRANCH to select hadoop versions to use.
   # All supported Hadoop versions that we want to test the compilation with
+  # NOTE: The master defines below are reused by BRANCH_2 too; if you change
+  # master instances, be sure to adjust BRANCH_2 appropriately.
   HBASE_MASTER_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"
   HBASE_MASTER_HADOOP3_VERSIONS="3.0.0-alpha2"
 
+  HBASE_BRANCH_2_HADOOP2_VERSIONS="${HBASE_MASTER_HADOOP2_VERSIONS}"
+  HBASE_BRANCH_2_HADOOP3_VERSIONS="${HBASE_MASTER_HADOOP3_VERSIONS}"
+
   HBASE_HADOOP2_VERSIONS="2.4.0 2.4.1 2.5.0 2.5.1 2.5.2 2.6.1 2.6.2 2.6.3 
2.6.4 2.6.5 2.7.1 2.7.2 2.7.3"
   HBASE_HADOOP3_VERSIONS=""
 
@@ -196,6 +201,9 @@ function hadoopcheck_rebuild
   if [[ "${PATCH_BRANCH}" = "master" ]]; then
     hbase_hadoop2_versions=${HBASE_MASTER_HADOOP2_VERSIONS}
     hbase_hadoop3_versions=${HBASE_MASTER_HADOOP3_VERSIONS}
+  elif [[ "${PATCH_BRANCH}" = "branch-2" ]]; then
+    hbase_hadoop2_versions=${HBASE_BRANCH_2_HADOOP2_VERSIONS}
+    hbase_hadoop3_versions=${HBASE_BRANCH_2_HADOOP3_VERSIONS}
   else
     hbase_hadoop2_versions=${HBASE_HADOOP2_VERSIONS}
     hbase_hadoop3_versions=${HBASE_HADOOP3_VERSIONS}

Reply via email to