Return-Path: X-Original-To: apmail-accumulo-dev-archive@www.apache.org Delivered-To: apmail-accumulo-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 130871896C for ; Sun, 26 Jul 2015 13:02:53 +0000 (UTC) Received: (qmail 32284 invoked by uid 500); 26 Jul 2015 13:02:43 -0000 Delivered-To: apmail-accumulo-dev-archive@accumulo.apache.org Received: (qmail 32241 invoked by uid 500); 26 Jul 2015 13:02:43 -0000 Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list dev@accumulo.apache.org Received: (qmail 32229 invoked by uid 99); 26 Jul 2015 13:02:43 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Jul 2015 13:02:43 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 894F218FECA for ; Sun, 26 Jul 2015 13:02:42 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.1 X-Spam-Level: X-Spam-Status: No, score=-0.1 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, SPF_HELO_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (1024-bit key) header.d=etcoleman.com Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id qRyF5FVll7iJ for ; Sun, 26 Jul 2015 13:02:33 +0000 (UTC) Received: from biz117.inmotionhosting.com (biz117.inmotionhosting.com [192.249.112.42]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTPS id 2F99442959 for ; Sun, 26 Jul 2015 13:02:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=etcoleman.com; s=default; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:In-Reply-To:References:Cc:To:From; bh=zmZbs+TbvTWEUhwMBUSZkmVutpXDrMWK35OrLQFsw1M=; b=HvMKFEH6ywgIw+tMAmxzFgcVvMi/8xXERsxy6+q28FE89MpwIrAhV7bVc7Y93NV0Uqt3ZEWwV+R9R5arwEBCA7991gXj5Zm/0YRKKdVzCjpDqAOZaCar9cy1dttYNb8O7xqg9TI6o4rmeTtWplMvwXyW0tCAnSqFtBXwwYdtirk=; Received: from c-73-173-99-162.hsd1.md.comcast.net ([73.173.99.162]:57226 helo=etcws01) by biz117.inmotionhosting.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.85) (envelope-from ) id 1ZJLZR-0000LI-7M; Sun, 26 Jul 2015 06:02:26 -0700 From: "Ed Coleman" To: Cc: References: <9c1f54a2afe04a85a02f87b55b2c5a03@git.apache.org> In-Reply-To: Subject: RE: Git Push Summary Date: Sun, 26 Jul 2015 09:02:17 -0400 Message-ID: <002001d0c7a3$4d4ec930$e7ec5b90$@etcoleman.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQFkIiPoO1/KD1PmsaSRUw9MYrIOKwIOvRV+nraByYA= Content-Language: en-us X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - biz117.inmotionhosting.com X-AntiAbuse: Original Domain - accumulo.apache.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - etcoleman.com X-Get-Message-Sender-Via: biz117.inmotionhosting.com: authenticated_id: dev1@etcoleman.com This was an oops in two parts. I was trying to make a push a small = change to the docs client section. My change was refs/heads/1.6 967100dda -> b83f88caf but I mistakenly = also ended up committing / pushing changes associated with: Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo = into 1.6 Commit: b83f88caf758ee9561d5041cc8d6fac3e6a68f62 Then, the second push (forced) was to unwind these changes by rolling = back to 967100dda. 967100dda was committed by Christopher on Friday 17 = July. Hope this helps reconstruct if anything was overwritten. Sorry. Ed Coleman -----Original Message----- From: Christopher [mailto:ctubbsii@apache.org]=20 Sent: Sunday, July 26, 2015 2:57 AM To: edcoleman@apache.org; Accumulo Dev List Subject: Fwd: Git Push Summary This looks like an "oops". We shouldn't be force-pushing anything to our = maintenance/development branches. We don't want to lose any history, and = we don't want to break forks (unless there's a very good reason, = discussed on the list first). It's probably okay to do this on a feature branch, while it's in = progress, but not once it's been merged/pushed to a maintenance branch = or master. If anybody has the specific extra commits that were previously pushed, = then overwritten, please restore them by merging them back in to the 1.6 branch. If you need help, please ask. Thanks. -- Christopher L Tubbs II http://gravatar.com/ctubbsii ---------- Forwarded message ---------- From: Date: Sun, Jul 26, 2015 at 12:29 AM Subject: Git Push Summary To: commits@accumulo.apache.org Repository: accumulo Updated Branches: refs/heads/1.6 b83f88caf -> 967100dda (forced update)