Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DC18E200CA6 for ; Tue, 13 Jun 2017 10:32:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DA9F6160BDC; Tue, 13 Jun 2017 08:32:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2A9D1160BC9 for ; Tue, 13 Jun 2017 10:32:15 +0200 (CEST) Received: (qmail 42018 invoked by uid 500); 13 Jun 2017 08:32:14 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 42003 invoked by uid 99); 13 Jun 2017 08:32:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jun 2017 08:32:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1EBBE01C3; Tue, 13 Jun 2017 08:32:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Message-Id: <9d4f05e39d0e4836becc3cbf3375902d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18200 Set hadoop check versions for branch-2 and branch-2.x in pre commit Date: Tue, 13 Jun 2017 08:32:12 +0000 (UTC) archived-at: Tue, 13 Jun 2017 08:32:16 -0000 Repository: hbase Updated Branches: refs/heads/master 384e308e9 -> f5768b430 HBASE-18200 Set hadoop check versions for branch-2 and branch-2.x in pre commit Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f5768b43 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f5768b43 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f5768b43 Branch: refs/heads/master Commit: f5768b4306afa676342663181f3b4e0c3f6a260d Parents: 384e308 Author: zhangduo Authored: Sun Jun 11 20:11:52 2017 +0800 Committer: zhangduo Committed: Tue Jun 13 16:31:34 2017 +0800 ---------------------------------------------------------------------- dev-support/hbase-personality.sh | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f5768b43/dev-support/hbase-personality.sh ---------------------------------------------------------------------- diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 6aa95f9..4620916 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -56,6 +56,9 @@ function personality_globals 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_BRANCH2_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_BRANCH2_HADOOP3_VERSIONS="3.0.0-alpha2" + 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 +199,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_BRANCH2_HADOOP2_VERSIONS} + hbase_hadoop3_versions=${HBASE_BRANCH2_HADOOP3_VERSIONS} else hbase_hadoop2_versions=${HBASE_HADOOP2_VERSIONS} hbase_hadoop3_versions=${HBASE_HADOOP3_VERSIONS}