Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-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 57AB117874 for ; Thu, 23 Oct 2014 21:31:37 +0000 (UTC) Received: (qmail 54911 invoked by uid 500); 23 Oct 2014 21:31:36 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 54871 invoked by uid 500); 23 Oct 2014 21:31:36 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 54518 invoked by uid 99); 23 Oct 2014 21:31:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Oct 2014 21:31:35 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) Received: from [209.85.213.51] (HELO mail-yh0-f51.google.com) (209.85.213.51) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Oct 2014 21:31:30 +0000 Received: by mail-yh0-f51.google.com with SMTP id t59so697530yho.10 for ; Thu, 23 Oct 2014 14:31:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=ZlXXdp5eAD4ewjR63vnA2LGDNFQV+kLmDD6hROAzFOs=; b=YHXZNl2Of3tos/5+KDrwYyFCTjdPsLyL/2Fyy34V1vyKXTgyYHu8syCeUhiZ5s29gj QREjRvX4y8ccEXdSM+SYaeGQ1ro/mnSr/a2f4jFRizXqBA7HaKshTUNlPDhpcHazPY8Z GroGO/vFAR6Q1Y2I98fFqIJyghXRhQ+rN1pdfWYdWCrcgujaPHR3XDCjrSohBu2BXjKn z0i6X7hRsQSAROqX0z4miCngpXBe4ewCp3ru+6NChqrEYh2EWIzd0wiyQTz3lm2hVX+5 wa2v/169T3vtuDkfl35bl1yR+IShMm1AoRC5sROCP2T9lbpPGeqAyNyPJqnk+Z7pE8gz WSvw== X-Gm-Message-State: ALoCoQn0w40XkeT/YhEzBMt8s4zFxkpPfsnzjFjPCByFADmT9JcYAw3DnGlOBGlT+Pbsj0E5A3Wk X-Received: by 10.170.146.133 with SMTP id n127mr74464ykc.129.1414099869157; Thu, 23 Oct 2014 14:31:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.220.98.73 with HTTP; Thu, 23 Oct 2014 14:30:47 -0700 (PDT) In-Reply-To: References: From: David Nalley Date: Thu, 23 Oct 2014 17:30:47 -0400 Message-ID: Subject: Re: commits on 4.5 To: Daan Hoogland Cc: dev Content-Type: text/plain; charset=UTF-8 X-Virus-Checked: Checked by ClamAV on apache.org On Thu, Oct 23, 2014 at 10:05 AM, Daan Hoogland wrote: > not nice, so merge back is no longer an option. I think I am almost > ready to admit to that. > > I came to that conclusion a week or so ago. If we could keep master as the release branch until we were imminently releasing, it might not be an issue. But people don't seem to want to treat master as a release branch under feature freeze. So we end up branching - and the two start diverging (rapidly) - at best we can cherry-pick to keep the two similar. --David