Return-Path: X-Original-To: apmail-nifi-dev-archive@minotaur.apache.org Delivered-To: apmail-nifi-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2954D180C2 for ; Wed, 20 Apr 2016 21:42:37 +0000 (UTC) Received: (qmail 63199 invoked by uid 500); 20 Apr 2016 21:42:37 -0000 Delivered-To: apmail-nifi-dev-archive@nifi.apache.org Received: (qmail 63166 invoked by uid 500); 20 Apr 2016 21:42:37 -0000 Mailing-List: contact dev-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list dev@nifi.apache.org Received: (qmail 63153 invoked by uid 99); 20 Apr 2016 21:42:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Apr 2016 21:42:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 42EF3C0319 for ; Wed, 20 Apr 2016 21:42:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.121 X-Spam-Level: X-Spam-Status: No, score=-0.121 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd4-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id AJBWaOw9Kvxb for ; Wed, 20 Apr 2016 21:42:35 +0000 (UTC) Received: from mail-yw0-f177.google.com (mail-yw0-f177.google.com [209.85.161.177]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTPS id B8F125F5A1 for ; Wed, 20 Apr 2016 21:42:34 +0000 (UTC) Received: by mail-yw0-f177.google.com with SMTP id t10so69256958ywa.0 for ; Wed, 20 Apr 2016 14:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to; bh=GqSr2nbokASTmDcUPZUNfUI+pdKK5UjlLx59IH5eSoE=; b=q1ZcADgrOa5sQNksS+zHFv4YVpc5bfqpN7y7pXoEpQMkCn1bRhQ2sMW2Q8jdokVF+V dIdrksb3PirxK8lPcUAa4lbAL8BcLUpRTPZIed9XEli6n2A1vBM5g9fWYmi6Nx4TXF+N JCvQYNPj0Y8alobJe+iyMhe6WE+DsGYPN6Rj+onvY9CTeM+e3jJuYBMLRJTRcI6L1yFM JTotprmVMOqHY0fruS710ejR2uUBvp6MAGednkGf9fmB+QnTa1rbO9b0Hnu/LM94RJcs wTv77S2806dk5N7qAVD2AJTnFgZy3hKwHtr1ycHJ5dSHWxJ6MNPT2dx6U+aztpbyeFU9 g9hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:date:message-id:subject:from:to; bh=GqSr2nbokASTmDcUPZUNfUI+pdKK5UjlLx59IH5eSoE=; b=cSZzgrCxtdaC0NCl6OeF4acj7qSz+WF3Qjw7E/NZjeK8w5IBz3Rt9zNOX5TMRR547A lTyLfiSv19ljC5CZSBkc3A8NCQLUvi+ROjSk/tWbq6jx1o11ppLsjkhpSBPF3iv375iA WQoGdfxCcSmyAS3YyOYe83AZtUS0Kjd3JJPnpP0fd3aOz5TbboaRicC7a2Tm/NDGSn1q ultnDHO3lH0oEI4tJ+ZbBk4ZvmkH3puC7wp97SxXlazZBMOgLOyhI06/Hmx2SHDIJBuY m4feGUFuQA3GdciItWg4myJ2v3vhREjHvOET6S3+Q6kozwGoW3IN3C4fr8oCiJ+/mfM4 H0oA== X-Gm-Message-State: AOPr4FX+GZmGsde9LvjmNjPMSbIDmMj3cIQxXqUs9/JeVcFN66+SWwLszMZ6a5uTmcCMMkuFFapBVJ+PCZkk4g== MIME-Version: 1.0 X-Received: by 10.129.122.66 with SMTP id v63mr6708183ywc.219.1461188553887; Wed, 20 Apr 2016 14:42:33 -0700 (PDT) Received: by 10.37.18.65 with HTTP; Wed, 20 Apr 2016 14:42:33 -0700 (PDT) Date: Wed, 20 Apr 2016 17:42:33 -0400 Message-ID: Subject: Release line support model and Git branching model From: Joe Witt To: dev@nifi.apache.org Content-Type: text/plain; charset=UTF-8 Team, There have been a couple lively threads on the subject [1][2] and we need to get these things documented so we have some shared framework to work from and we can tweak as needed. I've tried to distill the discussion in [1] and [2] and captured from our recent practices the model as it is today. Assuming lazy consensus I have documented the model's we're following [3]. [1] https://s.apache.org/FgG2 [2] https://s.apache.org/0zf5 [3] https://cwiki.apache.org/confluence/display/NIFI/Git+Branching+and+Release+Line+Management Thanks Joe