From dev-return-31211-apmail-tika-dev-archive=tika.apache.org@tika.apache.org Wed Jul 10 14:05:00 2019 Return-Path: X-Original-To: apmail-tika-dev-archive@www.apache.org Delivered-To: apmail-tika-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id BDEE619BE5 for ; Wed, 10 Jul 2019 14:04:59 +0000 (UTC) Received: (qmail 73761 invoked by uid 500); 10 Jul 2019 14:04:58 -0000 Delivered-To: apmail-tika-dev-archive@tika.apache.org Received: (qmail 73737 invoked by uid 500); 10 Jul 2019 14:04:58 -0000 Mailing-List: contact dev-help@tika.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tika.apache.org Delivered-To: mailing list dev@tika.apache.org Received: (qmail 73725 invoked by uid 99); 10 Jul 2019 14:04:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jul 2019 14:04:58 +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 8C420180F68 for ; Wed, 10 Jul 2019 14:04:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 3.094 X-Spam-Level: *** X-Spam-Status: No, score=3.094 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=2, PDS_NO_HELO_DNS=1.294, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd3-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-ec2-va.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id l6iiQa7biVNI for ; Wed, 10 Jul 2019 14:04:56 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.167.48; helo=mail-lf1-f48.google.com; envelope-from=sberyozkin@gmail.com; receiver= Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by mx1-ec2-va.apache.org (ASF Mail Server at mx1-ec2-va.apache.org) with ESMTPS id 20EDDBC761 for ; Wed, 10 Jul 2019 14:04:56 +0000 (UTC) Received: by mail-lf1-f48.google.com with SMTP id z15so1668535lfh.13 for ; Wed, 10 Jul 2019 07:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=bUUp4Lk/46tBCK1Mg0f36xUGPaQCvpzgszCv4GppmtQ=; b=DfLsrcYWZddVAR7oDv0W43NQqYK0rLyvVRy1mbss07t5kuaLwXPT1IVjtWFG3KOTwk tuBZnSiHfV3iPnvB5CEcZPaFErTm9zhxqz3GoorM5bVYWcks/fK5SNBIPdBuU1uKfpEx ErzITY0W1W7ZzeXRAses0ze7DZelWcRvrkRjJMZJTnvNRB6ghb3XWrGxsBCljRkGfFfn aMEVuY2Kyv4cnty7o/aEDi2bdJ1jnx0m2YfX6T2pB2+vzeFzF785L0K/UPzkdDxYFkhg hvBwXuI2aEY/Khdu9zMpE5MGJ5C7Jon2LVnlF7SyfLxHUx7LZhnZRmtCEHO04tyigJRq 58MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=bUUp4Lk/46tBCK1Mg0f36xUGPaQCvpzgszCv4GppmtQ=; b=W7jF3Heqg2kCmQRzMh8tLzrNVTYBq+zwDgtcVpG3dAvPPMj1MOC3L7TMIwrO7DO7kO VT9UP19vJ1RrIimD3KcI444LzQ9HwhwWstpXcq1KpDhU6XtPVM/tGYQp0ZaNtq6LsNig YU7OycSF0RYfPSzSPtj7dTIKgbO62DaDXA6KHVv+PNaQIOeAI7RUYyZnsm5dTamSHVBb nA019cui/KAtbKaQ6O1VRbrWgjMt1uSS03jmgZpWuFhpNdn0O5QkWFFLG35iukZjCWpL Zneca2bq5wMapbsdJQL6nKQ2b29kMkUCOoGZ8M6HK4EmRnK7735k7Qqqz3BphQcbm3Z0 vJcA== X-Gm-Message-State: APjAAAUBUA8e4+emNAftX2NyTYtzGkY4+ujTAtSbb45fZ/sVEMYi5mP7 yZrIq35E34G6y/K8Y/U/zkdiLS2guRGzp11U7imMqQ== X-Google-Smtp-Source: APXvYqwwz3MUkRgH4t/sOTzCL/Z1XWomwGz1WgTGw2zcMAzVyQVjZXaQsHVv9KCkHe0iERRFTImMSiARog1kYl0cB9Q= X-Received: by 2002:a19:6e41:: with SMTP id q1mr15492677lfk.20.1562767489283; Wed, 10 Jul 2019 07:04:49 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Sergey Beryozkin Date: Wed, 10 Jul 2019 15:04:38 +0100 Message-ID: Subject: Re: Merge flow To: "" Content-Type: multipart/alternative; boundary="00000000000010bdde058d54297e" --00000000000010bdde058d54297e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks, I was just curious, hope to start contributing a bit more... Sergey On Wed, Jul 10, 2019 at 1:39 PM Tim Allison wrote: > Y. Although sometimes I flip the order. :D > > If it matters or if I=E2=80=99m doing something wrong, let me know! > > On Wed, Jul 10, 2019 at 4:52 AM Sergey Beryozkin > wrote: > > > Hi Tim > > > > What is the current process for merging the fixes ? The fix goes to the > > master first and then it is cherry-picked into the branch_1x ? > > > > Cheers, Sergey > > > --00000000000010bdde058d54297e--