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 04589200CF3 for ; Thu, 14 Sep 2017 00:02:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 01AF71609CA; Wed, 13 Sep 2017 22:02:12 +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 44CB01609C3 for ; Thu, 14 Sep 2017 00:02:11 +0200 (CEST) Received: (qmail 90768 invoked by uid 500); 13 Sep 2017 22:02:10 -0000 Mailing-List: contact dev-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list dev@openwhisk.apache.org Received: (qmail 90751 invoked by uid 99); 13 Sep 2017 22:02:10 -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; Wed, 13 Sep 2017 22:02:10 +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 9A09FD4CBE for ; Wed, 13 Sep 2017 22:02:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 3.542 X-Spam-Level: *** X-Spam-Status: No, score=3.542 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, HTML_OBFUSCATE_10_20=1.162, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SORBS_SPAM=0.5, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id lcA41z1l4FLy for ; Wed, 13 Sep 2017 22:02:08 +0000 (UTC) Received: from mail-yw0-f174.google.com (mail-yw0-f174.google.com [209.85.161.174]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id C5ED25F5B4 for ; Wed, 13 Sep 2017 22:02:07 +0000 (UTC) Received: by mail-yw0-f174.google.com with SMTP id s62so3563316ywg.0 for ; Wed, 13 Sep 2017 15:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=+pc7CXaBdzlyI99QvI2WSxvQQHbA3nZr0P0gPB6imJw=; b=kYgQVQLDoZ8zYeeGyHwtxfaeYRCuVWYOi5mFVuO3BoGAkt/jIzBUCMj8khzmGDDjcc T72PGd8AZUQF3j5nUM6tairkGN9RQPrJdBe0D91p4ErycCfxlRl7yWfpMctjerFl+Bf9 s8adELeCLvh+hf/9DPs/cZNkukNJTaS00sg1vo7DVe5cyuWvx2oyYRyqBiykZ+IfBxLr iSYGA7o62u6Ht0N2S99CXwtMFLDfkdvGZmNupvVmde2CVauGH524bqE1WjJomvZ15i5h QjXhX3C4xuWpYYoiG8/DlJpHJ0bYgUSdQySKoa6rvFFsYH31HJ1T2n/WFkcpkZl1k61W ts1Q== 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=+pc7CXaBdzlyI99QvI2WSxvQQHbA3nZr0P0gPB6imJw=; b=nLeyfFEDvqH6MHEuQu/yfixoEn/xP8YhOSwt5+w+0pBuvUyENujw3SgY5QzFT6Lr4H uTxGK7n6SFRuUpKt+B3xxajQljIoKcmWq7ix/k/KfjsXqtOu/4v/rnfZ7Gf9MHkP1pF8 zAlrWNxYJqa9ROvGDZuBKnlRaqoPgORt1D+jeOyczF7y32uK6FUGiGi46LSnDVnKayXc 4GCKUN/wUZCZQZ6UBrfz5o1Thg0as+a1T7nHwVhEeUR2GRGiSGPNnfKk99eH8iUReNrS BiRFAvz87KBcKyET9opBSC+ioHNewCKBhMSLUBI0fyt0fLuRdHFXTJPLchCxyc0Briiw gkJw== X-Gm-Message-State: AHPjjUj25OBCIJV+QBSWUYne2UEgi+sA3B4Wa5GR7wphN/Awz2BV7rms /EPbfn5BxHCxo8liXrWY///8zi5bHb1vZDJa6tuZlLl6 X-Google-Smtp-Source: ADKCNb5TEXn2zBiLa7eIa4rmkkF9NbTerAUXkMF4rkxF38v+SZ14npsKEU0XAWXerlHAl/zlQtBrXtPNq2WG9DspxaQ= X-Received: by 10.13.242.196 with SMTP id b187mr18430048ywf.285.1505340120623; Wed, 13 Sep 2017 15:02:00 -0700 (PDT) MIME-Version: 1.0 Received: by 10.13.247.6 with HTTP; Wed, 13 Sep 2017 15:01:19 -0700 (PDT) In-Reply-To: References: From: Rodric Rabbah Date: Wed, 13 Sep 2017 18:01:19 -0400 Message-ID: Subject: Re: Git commit To: dev@openwhisk.apache.org Content-Type: multipart/alternative; boundary="94eb2c03401027f1c70559194f34" archived-at: Wed, 13 Sep 2017 22:02:12 -0000 --94eb2c03401027f1c70559194f34 Content-Type: text/plain; charset="UTF-8" With Matt's help, I created a JIRA issue https://issues.apache.org/jira/browse/INFRA-15081 for reference. -r On Wed, Sep 13, 2017 at 5:02 PM, Rodric Rabbah wrote: > Thanks Matt. > > Separately, Carlos suggested reverting the commit and then commit again. > Absent a better suggestion/option, I'll do that. > > On a side note, I will now be more careful using the shinny green button > which I think some of us have gotten accustomed to recently. > > -r > > On Wed, Sep 13, 2017 at 5:00 PM, Matt Rutkowski > wrote: > >> Sounds like a question for INFRA team; however, only a few are working >> with GitHub and would not be surprised if they do not have a procedure for >> this. For Apache purposes, it would be important for "Snoot" tool to ack. >> credit for committers when multiple appear on the same merge. >> >> >> >> >> From: Rodric Rabbah >> To: dev@openwhisk.apache.org >> Date: 09/13/2017 03:05 PM >> Subject: Git commit >> >> >> >> Hi >> >> I just merged a PR: >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github. >> com_apache_incubator-2Dopenwhisk_pull_2718&d=DwIFAg&c=jf_ >> iaSHvJObTbx-siA1ZOg&r=6zQLM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlA >> Jj4Zw&m=IPgHMBExfU1B6EDZtJh9gTpAvgNGZqmYvqNPXwQCEGo&s=wQxKGq >> 6kmqsqwqpwOm7jVnAPJ5aj4_ZxxtcacxAPBsA&e= >> >> >> You can see if look at it the first commit is it mine but is Scott >> Wilson-Billing's. >> >> Yet when I squashed and merge the PR (which I opened to rebase and update >> because we dropped the ball on its predecessor >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github. >> com_apache_incubator-2Dopenwhisk_pull_2171&d=DwIFAg&c=jf_ >> iaSHvJObTbx-siA1ZOg&r=6zQLM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlA >> Jj4Zw&m=IPgHMBExfU1B6EDZtJh9gTpAvgNGZqmYvqNPXwQCEGo&s= >> WjsheALhQmd-XeZy1hnygJ2IIqbOLDILcQt6rSCiWjo&e= >> ) I was credited with the commit [1] which is not right. >> >> I don't know how to correct this without forcing an updated commit (which >> I don't think we have rights to). What's the Apache way of fixing this? >> >> -r >> >> [1] >> https://urldefense.proofpoint.com/v2/url?u=https-3A__github. >> com_apache_incubator-2Dopenwhisk_commit_ec56eb81005a0a62cadd >> 591ca55e1468c73df2b3&d=DwIFAg&c=jf_iaSHvJObTbx-siA1ZOg&r=6zQ >> LM7Gc0Sv1iwayKOKa4_SFxRIxS478q2gZlAJj4Zw&m=IPgHMBExfU1B6EDZt >> Jh9gTpAvgNGZqmYvqNPXwQCEGo&s=-1rdGjaZwu-DQK60KeQFNgn7eWRe8jc >> sl20UM1u1sKs&e= >> >> >> >> >> > --94eb2c03401027f1c70559194f34--