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 D68C617F74 for ; Thu, 16 Oct 2014 09:35:29 +0000 (UTC) Received: (qmail 88852 invoked by uid 500); 16 Oct 2014 09:35:29 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 88801 invoked by uid 500); 16 Oct 2014 09:35:29 -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 88789 invoked by uid 99); 16 Oct 2014 09:35:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 09:35:28 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of daan.hoogland@gmail.com designates 209.85.223.172 as permitted sender) Received: from [209.85.223.172] (HELO mail-ie0-f172.google.com) (209.85.223.172) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 09:35:02 +0000 Received: by mail-ie0-f172.google.com with SMTP id rl12so3077517iec.3 for ; Thu, 16 Oct 2014 02:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:from:date:message-id:subject:to:content-type; bh=gZJmFVkrPK1gB3ZkR5w4ERapY4hnQ4+HRp7RAYgYBb0=; b=t16+Cw/aRPQVvX5jpMrFq4eqCg1Ji7lw2nkezmaJJR2nKoiZYqi0SRyGsB0wXjyK6z zIu5ufl63EZAgZxXz8a6V8s7TTTxK9gfOSznooFAVgYZ3TdKhgatrjIlcdAWhHjBfUtC JAFyNEKNrrzeTHnguyTSQ0SJXQI+nf0sRh5VIwSOxwDqYxuOIzRbnsj0H17ec9ejhqMu +SOHbja9MybD1OgAAweSo8jgAetdrKQEvkRsVCZ2FBgZD1xxVcF5x65nCWHbpK8rxVT9 cE3gCV2IUxrs59s4oNVQCTPwN6Xykob872renkNbTZQ1YtzHA9Vm8Yks5rlwBn72ofRW RNQw== X-Received: by 10.107.156.17 with SMTP id f17mr160393ioe.15.1413452101256; Thu, 16 Oct 2014 02:35:01 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.174.148 with HTTP; Thu, 16 Oct 2014 02:34:41 -0700 (PDT) From: Daan Hoogland Date: Thu, 16 Oct 2014 11:34:41 +0200 Message-ID: Subject: merging versus cherry-picking To: dev Content-Type: multipart/alternative; boundary=001a1141ba06670ce7050586f634 X-Virus-Checked: Checked by ClamAV on apache.org --001a1141ba06670ce7050586f634 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable H, I noticed a lot of commits on master and 4.5 without any links between them. These could have all been committed on 4.5 and merged back into master leaving a trail of prove that the same code is in both branches. It hurts to see this happen. we are at a brink where we can improve on our way of working. Let's do so. I will do a test merge-back of 4.5 to master to see how big the damage is=E2=80=8B. --=20 Daan --001a1141ba06670ce7050586f634--