From dev-return-67669-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Mon Jan 22 20:49:02 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 26626180609 for ; Mon, 22 Jan 2018 20:49:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 16F8A160C4B; Mon, 22 Jan 2018 19:49:02 +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 36666160C32 for ; Mon, 22 Jan 2018 20:49:01 +0100 (CET) Received: (qmail 75460 invoked by uid 500); 22 Jan 2018 19:48:59 -0000 Mailing-List: contact dev-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 dev@hbase.apache.org Received: (qmail 75443 invoked by uid 99); 22 Jan 2018 19:48:59 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jan 2018 19:48:59 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id BFEF8C3BD2 for ; Mon, 22 Jan 2018 19:48:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.898 X-Spam-Level: * X-Spam-Status: No, score=1.898 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=cloudera.com Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id vW3QX6goHHWJ for ; Mon, 22 Jan 2018 19:48:57 +0000 (UTC) Received: from mail-ua0-f175.google.com (mail-ua0-f175.google.com [209.85.217.175]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 655D65F3F0 for ; Mon, 22 Jan 2018 19:48:57 +0000 (UTC) Received: by mail-ua0-f175.google.com with SMTP id z3so1682381uae.12 for ; Mon, 22 Jan 2018 11:48:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudera.com; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=S8hQFB/V3fxkrmPfdiXaOCZB9VB3vW5C9bHvqiFBhI4=; b=fiWJSux9hWMcdWZFrzambJubBpxSsWpMSxcDlx9x1KXtO3Ry5Qx2ipuAzGHkui5m/p wAt7KCrNtZwzJnGboV15Cd5y71cuI9Bkct/wq0m21RFF66wzobufoiffLx7TDsKSk/Fu 67B3DpYyfvOp4jYt9NylptF8FSXkqaaBy24F7/mtbKJlH12Ie03y3K1TH7Zj+IXQE1YS Jk0NqxQVKDQwAOF3a8MteOpGufoDC/wABWUcQ+KIqkLdg7BCAuWNJBJ4bShPqmeczVpQ 4H3gay3Yyu6VVegPlQJvGWGNdA9089hYcFRy1OdX5YAzXiX3eNj+D/CPol4/hXIT56fH JA8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=S8hQFB/V3fxkrmPfdiXaOCZB9VB3vW5C9bHvqiFBhI4=; b=kdXN1WAWf+Os4nnIrXKEUHrG7FEVV/bsIuxP7MWOIqDzFTlkQuojWrRmUZ3L8dxh5I y8T4YIlvWo9BUqHYuXPtboCSJWg+ODQxM+2gDXSBO/3AqTCENaIQtqfjrpBJs4hsGPHV 7EV0thngsP2HOLXOfVM7BSTMpSR8Gos5PYxTUGray2o+3pGLJnCCajMSgtzKlUAo5ea9 cad0t/SJwijuwuay8lsloAAF7GC3LqtR/EbgOB9mC5VdeMVn4enF9ZSnv1RtlqHfvGC4 Lnu5S9VaCsNEXaWRkixw5EQg9J0rAh9kDlnISh7LMy16Mevz5pf0Tgha6UBGPrAxdqBZ ppIQ== X-Gm-Message-State: AKwxytedQbbuZ3ZOuyRthoD/xJAj2U4vDDKdDUIZHlOXq65e9XbSbzsv VXm672UJl3n3smfjQl5dHO1BZdhgHlqF1jAAebL0qQo= X-Google-Smtp-Source: AH8x2277U7TBRrnazS9jCrAjLKaSLdozPYcuPpKB0GzJLVOLFadw6XqR2JsNONXCBkrDjkViR2ES03pnPDIxwfHkgYw= X-Received: by 10.176.24.170 with SMTP id t42mr6273624uag.187.1516650536561; Mon, 22 Jan 2018 11:48:56 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.171.207 with HTTP; Mon, 22 Jan 2018 11:48:26 -0800 (PST) In-Reply-To: References: From: Apekshit Sharma Date: Mon, 22 Jan 2018 11:48:26 -0800 Message-ID: Subject: Re: Two master branches? To: dev@hbase.apache.org Content-Type: multipart/alternative; boundary="f40304378a747b1a36056362b894" --f40304378a747b1a36056362b894 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Both branches are same. appy appy-MBP-3 ~/apache/hbase (master) =E2=86=92 git log apache/master..apache/Master appy appy-MBP-3 ~/apache/hbase (master) =E2=86=92 git log apache/Master..apache/master Deleting "Master" branch. I just hope that there is no weird case-sensitiveness issue which deletes both. On Mon, Jan 22, 2018 at 11:14 AM, rahul gidwani wrote: > I have the same issue that Peter has.... > > I assume the solution is re-clone like ted suggested. > > On Mon, Jan 22, 2018 at 10:41 AM, Ted Yu wrote: > > > When I did 'git pull' in workspace for master branch today, I got: > > > > error: Ref refs/remotes/origin/master is at > > 298dc0c626e3844d9a1551cc3e293f518277e89c but expected > > d155a4e33d279bdf4b57b08ebc8220fe5d97f4cc > > From https://git-wip-us.apache.org/repos/asf/hbase > > ! d155a4e..9a45e0a master -> origin/master (unable to update loc= al > > ref) > > > > I have to re-clone workspace for master. > > > > FYI > > > > On Mon, Jan 22, 2018 at 1:10 AM, Peter Somogyi > > wrote: > > > > > Something is still not correct with the branches in the apache repo. > > > After git pull the master branch points to f3c563fc00 but in log > > > apache/master is still on 298dc0c626. The pull does the following all > the > > > time, working directory is clean. apache/Master also points to > > 298dc0c626. > > > > > > $ git pull > > > From https://github.com/apache/hbase > > > 298dc0c626..f3c563fc00 master -> apache/master > > > * [new branch] Master -> apache/Master > > > Already up to date. > > > > > > $ git status > > > On branch master > > > Your branch is ahead of 'apache/master' by 7 commits. > > > (use "git push" to publish your local commits) > > > > > > nothing to commit, working tree clean > > > > > > $ git lg > > > * f3c563fc00 - (HEAD -> master) HBASE-19837 Flakey TestRegionLoad (2 > > hours > > > ago) > > > * 27d00f5861 - HBASE-19794 TestZooKeeper hangs (20 hours ago) > > Stack> > > > * 7fe4aa6fe4 - HBASE-19828 Flakey > > > TestRegionsOnMasterOptions.testRegionsOnAllServers (2 days ago) > > > Stack> > > > * 11d6e6b1e6 - HBASE-19829 hadoop-minicluster pulls > > > zookeeper:test-jar:tests 3.4.6 (2 days ago) > > > * 4bfdcaa3f3 - HBASE-19823 Make RawCellBuilderFactory > > > LimitedPrivate.UNITTEST (2 days ago) > > > * 579586c697 - HBASE-19827 Addendum for Flakey TestAssignmentManager > > Don't > > > clear old location from RTP... (2 days ago) > > > * c66b42fd9d - Revert "HBASE-19827 Addendum for Flakey > > > TestAssignmentManager" Premature commit. (3 days ago) > > > * 298dc0c626 - (apache/master) HBASE-19822 Override cancel(boolean) i= n > > > LogCleaner (Addendum) (3 days ago) > > > > > > > > > On Sat, Jan 20, 2018 at 7:50 AM, Stack wrote: > > > > > > > Looks like Master was added a few days ago, by mistake is my guess: > > > > https://github.com/apache/hbase/branches > > > > > > > > Kill it after ensuring master has all its commits? > > > > > > > > Shout if you want me to do it sir. > > > > > > > > S > > > > > > > > On Fri, Jan 19, 2018 at 2:50 PM, Apekshit Sharma > > > > wrote: > > > > > > > > > I see following three branches: > > > > > remotes/apache/HEAD -> apache/master > > > > > remotes/apache/Master > > > > > remotes/apache/master > > > > > > > > > > Was "Master" always there? > > > > > > > > > > -- > > > > > > > > > > -- Appy > > > > > > > > > > > > > > > --=20 -- Appy --f40304378a747b1a36056362b894--